Upgrade to v2.2.1