Merge branch 'jc/maint-fetch-tighten-refname-check'