Merge branch 'jk/command-line-config-empty-string' into maint