[3.9] Add ElasticSearch support