Merge branch 'sb/hashmap-cleanup'