Merge branch 'jk/config-parsing-cleanup'