Initial Spring 2.0 checkin