Merge branch 'sb/plug-streaming-leak'