Merge branch 'jk/tag-sort'