Changes for 4.0.0-rc3