Merge "Add a new parameter for Elasticsearch"