added feature flag for Metrics