Rolling forward 2.5.2-RR changes