Merge branch 'jk/lock-ref-sha1-basic-return-errors'