Merge branch 'MAINT_3_4_6' into QA_3_4