Merge pull request #20233 from aquilacooper/patch-1