Merge pull request #17763 from eileenmcnaughton/dps