Merge branch 'jk/tag-sort' into next