Fixes for DSC-236
Merged with remote bulk_upload
Merge pull request #509 from nla/bulk-upload

Bulk upload - Fixes for DSC-337