Upgrade to release v4.0.0