Merge pull request #17282 from TDT-AG/pr/20211207-openwisp