Update to the latest cli APIs
Merge branch 'fix_latest_cli'