Merge "Fix API name" into jb-mr2-dev