Merge pull request #24269 from neheb/o