[FIX]return order vals

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

Merge request reports