Merge "Add feature flag" into main