[FIX] Picking validation

Closed Hermes requested to merge picking-fix into 12.0-prod-dot91

Merge request reports