Merge remote-tracking branch 'parent/main' into upstream-20240531 #3007

Job	Run time
build (production)	2m 37s
build (test)	2m 59s
test (3.1)	10m 5s
test (3.2)	8m 54s
Back to original and return test (.ruby-version)	11m 43s
End to End testing (3.1)	4m 16s
test (.ruby-version)	10m 42s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 58s
End to End testing (3.2)	3m 37s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 47s
End to End testing (.ruby-version)	3m 32s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 42s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 54s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 50s
	1h 13m 36s

Provide feedback