Chore/multiupload

@alex-deaconu please review