Merge new-core