New channel stream design and minimal changes.
Merge remote-tracking branch 'origin/master'