Merge upstream changes up to a9643cb7e77fd345b48877ed958d406403ad1b46 #1835

Job	Run time
build (production)	1m 15s
build (test)	1m 33s
test (3.2)	6m 11s
End to End testing (3.2)	3m 5s
Libvips tests (3.2)	2m 12s
test (3.3)	6m 11s
End to End testing (3.3)	3m 27s
test (.ruby-version)	6m 34s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 40s
Libvips tests (3.3)	4m 37s
End to End testing (.ruby-version)	2m 52s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 19s
Libvips tests (.ruby-version)	2m 14s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 21s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 41s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 29s
	57m 41s

Provide feedback