[FIX] Picking

Merged Tomás Canzoniero requested to merge fix_picking into 11.0-stage

Merge request reports