Merge "Revert "Turn on the transition flag"" into sc-dev