Updated to the latest version of the v4.0 core code