3.5.7
Merge branch 'MAINT_3_5_7' into QA_3_5
Fix merge conflicts