Merge branch 'lt/block-sha1'