Upgrade to CI 2.2.0