Rice upgrade 2.4.0 m5 r45020