Merge upstream changes up to a9643cb7e77fd345b48877ed958d406403ad1b46 #1836

Job	Run time
build (production)	1m 6s
build (test)	1m 58s
test (3.2)	6m 19s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 28s
Libvips tests (3.2)	1m 52s
test (3.3)	6m 26s
test (.ruby-version)	6m 38s
Libvips tests (3.3)	1m 51s
Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 48s
Libvips tests (.ruby-version)	2m 2s
End to End testing (3.2)	3m 6s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 17s
End to End testing (3.3)	3m 11s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 45s
End to End testing (.ruby-version)	2m 59s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 21s
	55m 7s

Provide feedback