11.0 modifications

Merged Ignacio Goitea requested to merge 11.0-modifications into 11.0-stage

Merge request reports