7.0 stage

Merged Uriel Mayo requested to merge 7.0-stage into 7.0

Merge request reports