Merge "Add XML support for extensions_client"