Merge upstream changes up to e68b26c8df2056182564abcee230927ed53200c8 #1705

Job	Run time
build (production)	3m 52s
build (test)	4m 10s
End to End testing (3.2)	2m 36s
End to End testing (.ruby-version)	2m 31s
test (3.2)	5m 7s
Libvips tests (3.2)	1m 41s
test (.ruby-version)	6m 6s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 10s
Libvips tests (.ruby-version)	3m 23s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 23s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 1s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 35s
	42m 35s

Provide feedback