Merge upstream changes up to a50c8e951f03a8eb53957ad1c3703155b223ed24 #1473

Job	Run time
build (production)	4m 2s
build (test)	3m 53s
End to End testing (3.1)	2m 42s
Libvips tests (3.1)	1m 42s
End to End testing (3.2)	2m 33s
test (3.1)	5m 54s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 54s
Libvips tests (3.2)	1m 30s
End to End testing (.ruby-version)	2m 30s
test (3.2)	5m 51s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 56s
Libvips tests (.ruby-version)	2m 13s
test (.ruby-version)	6m 51s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 2s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 16s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 17s
	55m 6s

Provide feedback