[IMP] Improve returned qty

(cherry picked from commit d32c0d51)

Merge request reports

Loading