Merge "Support gradual feature rollout" into main