Merge "[SDC] Update Streams"