When applying sorts, remember and honor previous choices
Merge branch 'memory_sort' into goodeggs