Merge branch 'jk/config-env-doc'