Merge pull request #20264 from TDT-AG/pr/20230111-xinetd