Merge "Update API" into jb-mr2-dev