cli usage api
merge
Merge branch 'finnp-usage'