Merge branch 'js/plug-leaks' into maint