Fixed bug in uploading.
Merge branch 'test' into dev