add UploadGroupId
Merge branch 'master' into qortex-payment