Merge branch 'jk/test-hashmap-updates'