Merge branch 'hn/sort-ls-remote'