Performance enhancements to RR2
Merge pull request #1716 from mmeisinger/fix1583_rr2_m

OOIION-1583: Performance enhancements to RR2