Merge branch 'jn/maint-plug-leak' into maint