Merge "Quickswitch with staged split" into sc-v2-dev