Preparing for next development release 4.x