Finish merge with t/forks/sort-refactor