Merge branch 'jn/send-pack-error' into maint