Merge branch 'js/plug-leaks'