Merge "Generalize rotation transition" into sc-dev