Merge "[COMMON] Add limits to Elasticsearch"