Squashed commit for ElasticSearch demos