Forward port #1381 to master - #1385

Forward port #1381 to master#1385

silvin-lubecki merged 6 commits into

docker:masterdocker/cli:masterfrom

dhiltgen:revamp_masterdhiltgen/cli-1:revamp_masterCopy head branch name to clipboard