[COMMIT] Sync carbon2 with the trunk