Updated for move to 1.2RC1