Merge "Improve API and documentation" into jb-mr2-dev