Merge "Revert "Fix stage split rotation"" into sc-v2-dev