Merge branch 'js/empty-config-section-fix'