Merge "API review fixes" into jb-dev