Merge branch 'ks/doc-use-camelcase-for-config-name' into maint