Updates for the 2.4.0-1 release