Upgrade to v1.8