Merge upstream changes up to c20824fa760061cf8fba258dbbd6b0a615df4749 #1797

Job	Run time
build (production)	1m 46s
build (test)	3m 10s
test (3.2)	6m 54s
Libvips tests (3.2)	4m 56s
End to End testing (3.2)	3m 3s
test (3.3)	5m 39s
Libvips tests (3.3)	3m 4s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 6s
test (.ruby-version)	7m 19s
End to End testing (3.3)	4m 2s
Libvips tests (.ruby-version)	7m 58s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 52s
End to End testing (.ruby-version)	3m 4s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	8m 26s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 31s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 37s
	1h 14m 27s

Provide feedback