Merge "Revert "Revert "Use std::set instead of SortedVector"""