Merge "Removed a feature flag" into main