Merge "Support new generated CustomFeatureFlags" into main