Merge upstream changes up to b7bdcd4f395aaa1e85930940975439d10b570f40 #754

Job	Run time
build (production)	4m 14s
build (test)	4m 15s
test (3.0)	10m 57s
End to End testing (3.0)	5m 26s
test (3.1)	9m 53s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 43s
End to End testing (3.1)	4m 55s
test (.ruby-version)	11m 58s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 18s
End to End testing (.ruby-version)	5m 5s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 21s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 21s
	1h 6m 26s

Provide feedback