Merge "Use new API" into oc-dev