Merge pull request #17785 from TDT-AG/pr/20220204-stunnel