Merge upstream changes (stable-4.3) #1635

Job	Run time
build (production)	5m 14s
build (test)	5m 31s
test (3.1)	5m 56s
Libvips tests (3.1)	1m 36s
test (3.2)	6m 34s
End to End testing (3.1)	2m 41s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 32s
Libvips tests (3.2)	2m 25s
test (.ruby-version)	7m 39s
End to End testing (3.2)	3m 22s
Libvips tests (.ruby-version)	2m 40s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 38s
End to End testing (.ruby-version)	3m 23s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 41s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 33s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	4m 5s
	1h 6m 30s

Provide feedback