[FIX]Return picking

Merged Gastón Bertolani requested to merge 11.0-return-picking into 11.0-stage

Merge request reports