Merge pull request #18936 from eileenmcnaughton/ppp