Merge branch 'sb/plug-leaks'