Merge "Update feature flag" into main