CLIParser: fixed for some non-string values
Merge remote-tracking branch 'origin/new' into new