Merge branch 'MAINT_3_4_7' into QA_3_4