initial checkin for update to 3.1