3.5.6-rc1
Merge branch 'MAINT_3_5_6' into QA_3_5