Merge branch 'bc/hash-algo'