3.5.6 release
Merge branch 'MAINT_3_5_6' into QA_3_5
Fix merge conflict