Timob 13958 Fixed regressions with the 3.2.0 CLI and integreated more CLI features