LOGSTASH-926 Including comments from Jordan