Merge branch 'sort-options'