Merge branch 'jk/credential-plug-leak' into maint