Update to use 2.5-M1 Rice version