Update to 2.2-BETA-1