Merge upstream changes up to 9d664f87a04b6a5157ddbe60ee33b5b7a960198e #1616

Job	Run time
build (production)	4m 53s
build (test)	5m 54s
Libvips tests (3.1)	1m 34s
End to End testing (3.1)	2m 32s
test (3.1)	5m 54s
Libvips tests (3.2)	1m 34s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 15s
End to End testing (3.2)	2m 53s
test (3.2)	5m 47s
Libvips tests (.ruby-version)	3m 9s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 19s
End to End testing (.ruby-version)	3m 52s
test (.ruby-version)	7m 28s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 42s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 37s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	4m 44s
	1h 5m 7s

Provide feedback