Merge branch 'R_2_5'