Merge pull request #10596 from stepshal/r_prefix