Merge "Remove deprecated feature flag"