4.0.1-rc1
Merge branch 'MAINT_4_0_1' into QA_4_0
4.0.2-dev
Merge branch 'QA_4_0'
Fix merge conflicts