Merge "fix the api style" into oc-dev