Novo cli updated
Merge origin/master