Merge branch 'use_emptyset' into hashmap_emptyWithCapacity