8.0 fix er

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

Merge request reports