[api] Client - organize parameters.
[api] Add an interactive shell for the API.
Merge remote-tracking branch 'origin/master'