Merged in internal_sha1 branch since we should use that as the basis going forward