Merge branch 'wip/hash'