Merge "Fix transitive equality error in set."