Merged RRP Changes