Merge "Updating API based on feedback" into jb-mr2-dev