CLOUD-67 cli changes