Code

Merge branch 'nm/grep-object-sha1-lock'