Master check-in

Master code check-in for os-framework template.