8.0 fix errors

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

Merge request reports