Merge upstream changes up to 4238da6ee3c93dfd5752e9133cbec958f8ebb18a #1636

Job	Run time
build (production)	5m 23s
build (test)	5m 19s
Libvips tests (3.1)	1m 38s
test (3.1)	5m 54s
Libvips tests (3.2)	1m 33s
End to End testing (3.1)	2m 49s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 12s
test (3.2)	5m 29s
End to End testing (3.2)	2m 47s
Libvips tests (.ruby-version)	3m 2s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 58s
test (.ruby-version)	7m 38s
End to End testing (.ruby-version)	3m 41s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 51s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 55s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	4m 4s
	1h 3m 13s

Provide feedback