11.0 fix transfer picking

Merged Gastón Bertolani requested to merge 11.0-fix-transfer-picking into 11.0-stage

Merge request reports