Upgrade to 4.0 M2