Merge branch 'jk/config-with-empty-section'