Merge branch 'jk/config-lockfile-leak-fix' into maint