Merge pull request #16810 from eileenmcnaughton/xml