[FIX] Picking ids

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

Merge request reports