RR 2.3.5 changes