Merge branch 'develop' into develop_m2_8_1_2