Merge "Parse user flags as flags instead of enum." into sc-v2-dev