Merge "@hide new API" into oc-mr1-dev