Merge branch 'more-config-types'