Merge branch '11.0-fix-changes' into '11.0-stage'

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

11.0 fix changes

See merge request !1 (merged)

Merge request reports