4.0.2-rc2
Merge branch 'MAINT_4_0_2' into QA_4_0
4.0.3-dev
Merge branch 'QA_4_0'
Fix merge conflicts