Merge branch 'nk/config-local-doc' into maint