Merge "Using a different transition for All-set activity" into sc-v2-dev