8.0 fix mod

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

Merge request reports