Merge newrelic changes