3.5.8-rc1
Merge branch 'MAINT_3_5_8' into QA_3_5
3.5.9-dev
Merge branch 'QA_3_5' into QA_4_0
Fix merge conflicts