Merge "Fix hash set memory leaks"