7.0 stage into 7.0

Merged Jose Luis Zanotti requested to merge 7.0-stage into 7.0

Merge request reports