Merge branch 'sp/maint-fetch-pack-stop-early'