Merge "Provide an easy way to drop in a different RS driver." into jb-mr1-dev