Merge upstream changes up to 752d49eefef48262d501ba5fc2006d2c8466a000 #1729

Job	Run time
build (production)	4m 37s
build (test)	4m 15s
Libvips tests (3.2)	2m 19s
test (3.2)	6m 11s
End to End testing (3.2)	3m 5s
Libvips tests (.ruby-version)	2m 8s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 54s
test (.ruby-version)	6m 20s
End to End testing (.ruby-version)	2m 39s
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 22s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 21s
	44m 28s

Provide feedback