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