Merge branch 'main' of https://github.com/elastic/elasticsearch into …

Merge branch 'main' of https://github.com/elastic/elasticsearch into … #882