11.0 fix xml generator

Merged Ignacio Goitea requested to merge 11.0-FIX-xml-generator into 11.0-stage

Merge request reports