Merge branch 'kb/fast-hashmap'