[FIX]Some modification

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

Merge request reports