Fix operation of download and streaming.
Merge branch 'master' into blaze