|#000| reverting few changes in E2EUpload