11.0 merge 11.0 to 11.0 stage

Merged Gastón Bertolani requested to merge 11.0-merge-11.0-to-11.0-stage into 11.0-stage

Merge request reports