XML: Refactor of feature detecting logic.
Merge remote-tracking branch 'origin/xml-fix' into release-3.14.1
XML: Build