8.0 resolve merge

Merged Gabriel Davini requested to merge 8.0-resolve_merge into 8.0-stage

Merge request reports