Merge branch 'jk/missing-config'