fix for upload files
Merge remote-tracking branch 'origin/develop/mvc' into build-3.2.1