Changes in prep for 2.4.0 beta