Merge latest API Changes(streams and channels)