Merge branch 'kb/name-hash'