pending move cli into separate module
Merge branch 'master' into develop