[Bug 381893] New: CLI improvement