Merge upstream changes up to 5b291fcbe41564264954618fb1f4086a3be1c600 #1819

Job	Run time
build (production)	2m 20s
build (test)	2m 37s
test (3.2)	6m 25s
End to End testing (3.2)	3m 47s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 51s
test (3.3)	6m 52s
Libvips tests (3.2)	1m 52s
End to End testing (3.3)	3m 6s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 6s
test (.ruby-version)	8m 9s
Libvips tests (3.3)	1m 51s
End to End testing (.ruby-version)	3m 58s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 55s
Libvips tests (.ruby-version)	2m 38s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 28s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 36s
	1h 2m 31s

Provide feedback