Prep for 4.0 release