11.0 fix error

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

Merge request reports