Merge upstream changes up to f1d4be1e7509f795706ff2310c5fc36e0e79bf4d #1848

Job	Run time
build (production)	4m 54s
build (test)	5m 1s
Libvips tests (3.2)	3m 19s
test (3.2)	7m 55s
Libvips tests (3.3)	3m 10s
End to End testing (3.2)	5m 19s
test (3.3)	8m 19s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	5m 21s
End to End testing (3.3)	5m 0s
Libvips tests (.ruby-version)	4m 10s
End to End testing (.ruby-version)	3m 8s
test (.ruby-version)	7m 46s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 54s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 45s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 40s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 23s
	1h 19m 4s

Provide feedback