Merge upstream changes up to 9a3d047f3e604e581e18346424569e28fc9c5b96 #605

Job	Run time
build (production)	7m 36s
build (test)	5m 16s
Testing search (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	6m 8s
Testing search (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	6m 34s
test (3.0, 1)	5m 18s
End to End testing (3.0)	7m 13s
Testing search (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 5s
test (3.0, 2)	6m 1s
End to End testing (3.1)	6m 8s
Testing search (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2)	4m 31s
End to End testing (.ruby-version)	5m 45s
test (3.0, 3)	4m 36s
test (3.0, 4)	4m 16s
test (3.1, 1)	4m 28s
test (3.1, 2)	6m 39s
test (3.1, 3)	6m 51s
test (3.1, 4)	6m 10s
test (.ruby-version, 1)	6m 35s
test (.ruby-version, 2)	5m 34s
test (.ruby-version, 3)	6m 29s
test (.ruby-version, 4)	4m 37s
	1h 59m 50s

Provide feedback