Merge "[DO NOT MERGE] Unfold refactor" into sc-v2-dev