Merge pull request #37182 from krwq/nullable-xml-3