Reuse the download url method for regular streaming
Merge branch 'download-url'