Merge remote-tracking branch 'upstream/main' #164

Job	Run time
build (production)	4m 3s
build (test)	4m 12s
test (3.0)	8m 19s
test (3.1)	8m 23s
End to End testing (3.0)	5m 17s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 12s
test (.ruby-version)	8m 56s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 2s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	1m 50s
End to End testing (3.1)	4m 57s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 21s
End to End testing (.ruby-version)	5m 6s
	59m 38s

Provide feedback