fixing another problem relevant to file upload.
Merge remote-tracking branch 'upstream/dev-v0.3.0' into dev-v0.3.0