Merge "[Spa] New SuwScaffold" into main