3.5.7-rc1
Merge branch 'MAINT_3_5_7' into QA_3_5
3.5.8-dev
Merge branch 'QA_3_5'
Fix merge conflict