Merge "Add cli as a submodule"