Merge branch 'jh/hashmap-disable-counting'