Merge branch 'sb/plug-transport-leak'