Merge branch 'bc/sha-256'