Merge branch 'ab/newhash-is-sha256'