Merge "Fix influxdb "field type conflict" error"