Upgrade to work with 8.0.0-alpha14