11.0 fix changes

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

Merge request reports