8.0 fix

Merged Gastón Bertolani requested to merge 8.0-fix into 8.0-stage

Merge request reports