Upgrade to 3.3.0