Initial Comparator commit