Merge branch 'jk/fetch-pack' into maint