Ms named streams merge2

Dummy PR so I can easily review it.
Add comment that this stream id should actually come from the MS.