Upgrade to 3.5.0