[Bug 381893] CLI improvement