Merge upstream changes up to 75ecc6df068ec2c21b26f05692eb5dfdc35671fa #1723

Job	Run time
build (production)	4m 8s
build (test)	4m 15s
End to End testing (3.2)	3m 4s
End to End testing (.ruby-version)	2m 29s
Libvips tests (3.2)	1m 54s
test (3.2)	5m 21s
Libvips tests (.ruby-version)	3m 35s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 18s
test (.ruby-version)	6m 37s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 17s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 4s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 30s
	44m 32s

Provide feedback