Merge branch 'bc/hash-algo' into maint