[IMP] Fix picking rates

Merged Jose Luis Zanotti requested to merge SE-751 into 12.0-prod-merge

Closes SE-751

Merge request reports