11.0 fix bug

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

Merge request reports