Merge "Convert existing flags to new system." into sc-v2-dev