Master code checkin

Complete checkin (Master code)