Merge remote-tracking branch 'origin/MAINT_3_4_5' into QA_3_4