CLI support Bug#962879