Merge pull request #20410 from eileenmcnaughton/ppp