Merge "Fix flag manager crash" into sc-v2-dev