Merge pull request #19247 from eileenmcnaughton/dep_utils