Merge pull request #16442 from eileenmcnaughton/pree