Merge "Simplify feature flags" into main