Fixes for DSC-236
Merged with remote bulk_upload