Minor nit for Streams API.
Merge branch 'master' into internal