Merge "Change feature flag to correct flag"