Hotfixes for the CLI backported to 1.0.19.2.