Merge branch 'jn/block-sha1' into maint