CORE-5707: Fixed uploads and downloads.