fix "fail to upload" issue.
Merge branch 'develop'