Merge branch 'MAINT_3_3_6' into QA_3_3