Merge branch 'jc/streaming' into next