Merge "Address API review comments" into oc-mr1-dev