Merge branch 'lt/block-sha1' into next