Merge branch 'sb/plug-misc-leaks'