Merge "Fix the HashMap performance regression."