Merge "Add XML support for flavors_client"