Merge "Api updates" into oc-dev