Merge pull request #18153 from larssg-wildsight/patch-1