Merge upstream changes up to d0753ec276502ea28a1e853cbc6487020a0602e3 #1713

Job	Run time
build (production)	4m 6s
build (test)	4m 26s
Libvips tests (3.2)	2m 3s
End to End testing (3.2)	2m 34s
test (3.2)	5m 16s
End to End testing (.ruby-version)	2m 29s
Libvips tests (.ruby-version)	1m 53s
test (.ruby-version)	6m 2s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 13s
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 10s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 38s
	42m 11s

Provide feedback