Merge branch 'main' of github.com:elastic/elasticsearch into batch-th… · davidkyle/elasticsearch@527e3ca