Initial partial build commit