Various fixes and improvements to the CLI

Merge request reports

Loading