8.0 fix merged report

Merged Reviewer Intergaláctico requested to merge 8.0-FIX_MergedReport into 8.0-stage

Merge request reports