[FIX]Sorted

Merged Gastón Bertolani requested to merge 12.0-fix-sorted into 12.0-stage

Merge request reports