3.5.8 release
Merge branch 'MAINT_3_5_8' into QA_3_5
Fix merge conflicts