Merge upstream changes up to 4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd #750

Job	Run time
build (production)	4m 8s
build (test)	4m 8s
test (3.0)	10m 40s
End to End testing (3.0)	5m 0s
test (3.1)	10m 45s
End to End testing (3.1)	5m 15s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 37s
test (.ruby-version)	11m 57s
End to End testing (.ruby-version)	4m 37s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 40s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 39s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 22s
	1h 6m 48s

Provide feedback