Merge branch 'jn/clone-add-empty-config-from-command-line' into maint