Merge pull request #24089 from TDT-AG/pr/20240506-stunnel