Merge branch 'MAINT_3_3_1' into QA_3_3