Merge "Refactor rd_pick_partition for parameter control"