Add NewRelic support
Merge branch 'feature-newrelic' into dev