Adoveo video upload, rebased on latest master