Merge branch 'R_2_2'