Updated coreApi.
Merge branch 'api-1.2' into cp-1.1