Merge branch 'jk/sha1write-void'