Merge branch 'jk/maint-config-bogus-section' into maint