Merge upstream changes up to 4fc8c6912979e8fd7882fb360b77e677ffd68565 #1841

Job	Run time
build (production)	4m 22s
build (test)	4m 29s
test (3.2)	7m 4s
Libvips tests (3.2)	2m 44s
test (3.3)	6m 49s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 37s
End to End testing (3.2)	3m 23s
Libvips tests (3.3)	2m 36s
test (.ruby-version)	6m 50s
End to End testing (3.3)	3m 16s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 43s
Libvips tests (.ruby-version)	2m 43s
End to End testing (.ruby-version)	2m 57s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 8s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 29s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	5m 10s
	1h 7m 20s

Provide feedback