Merge pull request #18242 from eileenmcnaughton/dep