8.0 fix error

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

Merge request reports