Merge upstream changes up to 89f89d738f5840c80ff938f8bf6734cdafe0fa83 #1310

Job	Run time
build (production)	3m 36s
build (test)	3m 38s
End to End testing (3.1)	5m 20s
End to End testing (3.2)	4m 40s
test (3.1)	7m 9s
End to End testing (.ruby-version)	5m 18s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 40s
test (3.2)	7m 30s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 36s
test (.ruby-version)	7m 58s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 16s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 42s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 29s
	57m 52s

Provide feedback