Update to v2.2.1a