Merge "overhaul rs_sampler" into jb-mr2-dev