merge of changes to CLI API

2 files changed