Merge branch 'kb/hashmap-updates'