Updated for 2.4.0.CR1 release