Merge branch 'jc/config-case-cmdline-take-2' into maint