Merge "Add sfc features and update carbon project branch"