Merge branch 'raw_instances' into hashmap_insert_simps