Adds v2 feature flag, turned off by default in production