Merge upstream changes up to ffc5be4820ed7bad4656489f096230dd7965140b #1189

Job	Run time
build (production)	3m 49s
build (test)	3m 54s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 29s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 27s
End to End testing (3.0)	5m 7s
End to End testing (3.1)	5m 22s
test (3.0)	9m 2s
End to End testing (.ruby-version)	4m 55s
test (3.1)	7m 30s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 44s
test (.ruby-version)	8m 31s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 0s
	58m 50s

Provide feedback