Merge pull request #21372 from eileenmcnaughton/ddep