Merge pull request #21523 from eileenmcnaughton/dep