[ADD]Control State in picking

Merged Gastón Bertolani requested to merge 11.0-control-state into 11.0-stage

Merge request reports