4.0.0-rc4
Merge branch 'MAINT_4_0_0' into QA_4_0
Merge branch 'QA_4_0'