Merge "Fix fc_sort to be deterministic"