Checkin 3 - and to upstream