Fix/cli

Merged Julien Wadel requested to merge fix/cli into release/4.3

Merge request reports