Merge "Revert "fc_sort: initial commit""