Merge pull request #20136 from eileenmcnaughton/dom