Use progress-stream to report.
Merge branch 'master' into progress-stream