Merge branch 'jk/parse-config-key-cleanup' into maint