Try to fix problem with duplicate streams.
Merge branch 'sharedView' into staging