fix "fail to upload" issue.
improve project build dependency.
Merge branch 'develop'