Merge pull request #20760 from eileenmcnaughton/dep