Merge pull request #20422 from eileenmcnaughton/ppp