Merge "Check the transient state by using public types" into sc-v2-dev