Merge "Implement comments from API review" into oc-mr1-dev