Initial checkin of spring 2.0