Preparing the 4.0 branch