Merge upstream changes up to 7c10b0fb7a078661558fef86399d86831423260c #1657

Job	Run time
build (production)	5m 9s
build (test)	5m 23s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 44s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 38s
test (3.1)	5m 29s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 1s
Libvips tests (3.1)	2m 1s
test (3.2)	5m 33s
End to End testing (3.1)	2m 57s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 5s
Libvips tests (3.2)	1m 50s
test (.ruby-version)	7m 10s
End to End testing (3.2)	3m 19s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 42s
Libvips tests (.ruby-version)	2m 55s
End to End testing (.ruby-version)	3m 5s
	1h 2m 1s

Provide feedback