7.0 revision

Merged Leandro Martinek requested to merge 7.0-revision into 7.0-stage

Merge request reports