[FIXED JENKINS-22925] [FIXED JENKINS-22923] - Cli call fixes