More code simplification.
Merge remote-tracking branch 'remotes/origin/master' into stream
Added FIXME.
Merge remote-tracking branch 'remotes/origin/master' into stream
Added missing stream method, unimplemented.
Ignore tests for stream features not implemented yet.
Hide stream features for now.