Merge branch 'mp/upload-pack-use-embedded-args' into maint