Merge pull request #18617 from eileenmcnaughton/ord