Fix comparing rp logic
Merge 2.3m/master