Merge branch 'jc/fetch-sorted'