Merge branch 'jk/maint-pass-c-config-in-env'