OOIION-1583: Performance enhancements to RR2