Ms named streams merge2

Dummy PR so I can easily review it.
NS_ERROR_NOT_AVAILABLE