Merge pull request #23978 from neheb/o