Merge pull request #18541 from eileenmcnaughton/dep