Add scheme to stream endpoint
Merge branch 'stream-endpoint-scheme'