Merge pull request #22345 from muink/patch-1