Merge "Change feature flag enabled behavior"