Merge branch 'jc/fetch-pull-refmap'