Updates for CF 9.0.x CHFs March 2013

Finally