Merge pull request #22599 from anthonyeleven/patch-2