Merge branch 'R_2_5' [ci skip]