Merge upstream changes up to 5b291fcbe41564264954618fb1f4086a3be1c600 #1822

Job	Run time
build (production)	1m 58s
build (test)	2m 8s
test (3.2)	6m 7s
End to End testing (3.2)	3m 5s
test (3.3)	5m 37s
End to End testing (3.3)	2m 55s
Libvips tests (3.2)	1m 52s
test (.ruby-version)	7m 32s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 10s
End to End testing (.ruby-version)	3m 48s
Libvips tests (3.3)	1m 53s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 44s
Libvips tests (.ruby-version)	2m 16s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 28s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 39s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 18s
	57m 30s

Provide feedback