Merge "Remove rest of the xml support" into release-4-6