11.0 stage bugfixed picking related

Merged Laureano Kloss requested to merge 11.0-stage_bugfixed_picking_related into 11.0-stage

Merge request reports