8.0 fix others

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

Merge request reports