7.0 stage

Merged Ignacio Goitea requested to merge 7.0-stage into 7.0

Merge request reports