Merge pull request #19051 from eileenmcnaughton/pps