Merge "Improve performance of HashSet"