Merge upstream changes up to 1e71c4e247eb8900a718b04113ffce9c1b8ad2f4 #1686

Job	Run time
build (production)	4m 3s
build (test)	3m 55s
End to End testing (3.2)	3m 3s
Libvips tests (3.2)	3m 25s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 21s
End to End testing (.ruby-version)	2m 30s
test (3.2)	5m 41s
Libvips tests (.ruby-version)	3m 44s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 30s
test (.ruby-version)	7m 38s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 27s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 6s
	47m 23s

Provide feedback