am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev

* commit 'ba56701493ede3f5f338a03173da0327a215b223':
  Improve API and documentation