Update for the 2.2 release