Merge pull request #18846 from eileenmcnaughton/ornery