Merge branch 'R_2_1'