Merge "Use plain HashMap instead of IdentityHashMap"