Updated for 2.2.0.RC1 release