Merge branch 'jn/block-sha1'