Merge "Enable support for telegraf"