Upgrade to 2.2.0