Merge pull request #18947 from eileenmcnaughton/pps