Update 7.0 from stage

Merged Santiago Said requested to merge 7.0-stage into 7.0

Merge request reports