Adapting channel stream to use thread endpoint.
Merge remote-tracking branch 'origin/master'