Merge "Modify Comparator in ZonePicker"