Merge upstream changes up to f79b96a5ef0f6c4f57eee7f44ce2579b28a22098 #1829

Job	Run time
build (production)	4m 1s
build (test)	4m 0s
End to End testing (3.2)	3m 7s
Libvips tests (3.2)	1m 53s
End to End testing (3.3)	3m 22s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 29s
Libvips tests (3.3)	2m 25s
test (3.2)	6m 16s
End to End testing (.ruby-version)	2m 56s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 44s
Libvips tests (.ruby-version)	2m 18s
test (3.3)	6m 10s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 46s
test (.ruby-version)	7m 20s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 25s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 47s
	1h 1m 59s

Provide feedback