Upgrade from CI 2.1.0 to CI 2.2.0