Merge pull request #20407 from eileenmcnaughton/ppp