Merge "Make slight API and doc adjustments" into oc-mr1-dev