Merge pull request #22960 from totten/master-out-of-curiosity