Merge pull request #19416 from eileenmcnaughton/dep