add UploadGroupId
Merge branch 'master' into novice-tutorials