Merge upstream changes up to 8156113d58db851d00f8052e66459e6dafb71e82 #1100

Job	Run time
build (production)	3m 39s
build (test)	3m 42s
test (3.0)	7m 47s
test (3.1)	7m 37s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 47s
End to End testing (3.0)	4m 49s
test (.ruby-version)	8m 42s
End to End testing (3.1)	4m 57s
End to End testing (.ruby-version)	5m 0s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 19s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 30s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 22s
	56m 11s

Provide feedback