[FIX]Refactory Code

Merged Gastón Bertolani requested to merge 11.0-fix-refactory-code into 11.0-stage

Merge request reports