Merge "Add config option for XML support in Networking"