Merge upstream changes up to f79b96a5ef0f6c4f57eee7f44ce2579b28a22098 #1831

Job	Run time
build (production)	3m 45s
build (test)	4m 9s
End to End testing (3.2)	4m 9s
Libvips tests (3.2)	2m 2s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 18s
End to End testing (3.3)	3m 33s
Libvips tests (3.3)	1m 47s
test (3.2)	5m 56s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 53s
End to End testing (.ruby-version)	3m 26s
Libvips tests (.ruby-version)	2m 20s
test (3.3)	5m 40s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 23s
test (.ruby-version)	8m 5s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 0s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 19s
	1h 2m 45s

Provide feedback