Merge upstream changes up to db971976853103017b1561f2c4f9406fa00c0a2e #1851

Job	Run time
build (production)	4m 2s
build (test)	4m 3s
test (3.2)	5m 57s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 20s
test (3.3)	6m 3s
Libvips tests (3.2)	1m 56s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 15s
test (.ruby-version)	6m 45s
End to End testing (3.2)	4m 8s
Libvips tests (3.3)	1m 58s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 42s
Libvips tests (.ruby-version)	2m 48s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 27s
End to End testing (3.3)	3m 25s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 25s
End to End testing (.ruby-version)	3m 49s
	1h 3m 3s

Provide feedback