[FIX] XML id

Merged Agustín Maio requested to merge FIX-xml_id into 11.0-stage

Merge request reports