Merge pull request #23080 from tru7/knxd