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