Merged 'cpp' into 'core'