Merge upstream changes up to a2624ff739ea555888f27b13a44f7d6b1af35a86 #768

Job	Run time
build (production)	4m 4s
build (test)	4m 3s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 28s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 35s
test (3.0)	10m 3s
End to End testing (3.0)	5m 3s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 2s
test (3.1)	10m 47s
End to End testing (3.1)	4m 53s
test (.ruby-version)	11m 55s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 46s
End to End testing (.ruby-version)	4m 39s
	1h 6m 18s

Provide feedback