Merge "Refactor some transition codes." into sc-dev