Merge pull request #18631 from eileenmcnaughton/ppp