Upgrade to v3-alpha9