Merge upstream changes up to d20a5c3ec9ed40a991245fe32d0acb6187dd48c4 #1325

Job	Run time
build (production)	3m 43s
build (test)	3m 49s
End to End testing (3.1)	6m 18s
test (3.1)	7m 17s
test (3.2)	7m 16s
test (.ruby-version)	8m 46s
End to End testing (3.2)	4m 48s
End to End testing (.ruby-version)	4m 52s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 25s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 17s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 23s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 30s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 36s
	59m 0s

Provide feedback