2.4.0 B2

Release ready?