Merge upstream changes up to 75ecc6df068ec2c21b26f05692eb5dfdc35671fa #1721

Job	Run time
build (production)	4m 20s
build (test)	5m 6s
Libvips tests (3.2)	2m 28s
End to End testing (3.2)	2m 49s
Libvips tests (.ruby-version)	2m 22s
test (3.2)	6m 1s
End to End testing (.ruby-version)	2m 49s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 23s
test (.ruby-version)	6m 38s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 59s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 12s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 17s
	45m 24s

Provide feedback