Cli refactor

cli refactor branch merge to devel