Upgrade to v3.5.1