[FIX]Order Matrix

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

Merge request reports