Merge upstream changes up to 9d664f87a04b6a5157ddbe60ee33b5b7a960198e #1613

Job	Run time
build (production)	4m 57s
build (test)	5m 7s
End to End testing (3.1)	2m 29s
End to End testing (3.2)	2m 34s
Libvips tests (3.1)	1m 34s
End to End testing (.ruby-version)	3m 11s
test (3.1)	6m 3s
Libvips tests (3.2)	2m 0s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 3s
test (3.2)	5m 53s
Libvips tests (.ruby-version)	2m 41s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 29s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 42s
test (.ruby-version)	7m 12s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 3s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	4m 42s
	1h 2m 40s

Provide feedback