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

* commit 'e37c8f781abb045ec4a0b872e5e6afe48eee021a':
  Improve API and documentation