Merge "Properly store values to pass to constant state" into sc-v2-dev