Merge branch 'streaming-plugin' into test-merge