Merge "improve logstash parsing"