Merge branch 'jk/drop-free-refspecs' into maint