Merge pull request #16861 from eileenmcnaughton/dep