Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maint