Rework pick

Domenico Giordanorequested to merge
rework-pick into qa

initial set of changes suggested by David

Merge request reports