Merge branch 'eb/upload-archive-from-git-shell'