merge in newrelic stuff