Returning stream from clean task, rather than callback
Merge branch 'master' into custom