Merge branch 'rj/restore-plug-leaks'