Merge "Add support for parsing states." into sc-v2-dev