Upgrade to v3-alpha5