Merge branch 'MAINT_3_4_1' into QA_3_4