Updated to 2.2-RC4