Merge upstream changes up to b7bdcd4f395aaa1e85930940975439d10b570f40 #753

Job	Run time
build (production)	3m 50s
build (test)	3m 58s
End to End testing (3.0)	5m 12s
End to End testing (3.1)	5m 13s
test (3.0)	10m 40s
End to End testing (.ruby-version)	4m 33s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 41s
test (3.1)	10m 20s
test (.ruby-version)	11m 26s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 6s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 29s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 28s
	1h 7m 56s

Provide feedback