Merge branch 'MAINT_3_4_0' into QA_3_4