Merge upstream changes up to e68b26c8df2056182564abcee230927ed53200c8 #1702

Job	Run time
build (production)	4m 18s
build (test)	4m 17s
test (3.2)	5m 22s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 22s
test (.ruby-version)	6m 21s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 44s
End to End testing (3.2)	2m 44s
Libvips tests (3.2)	2m 31s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 21s
End to End testing (.ruby-version)	2m 26s
Libvips tests (.ruby-version)	2m 0s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 0s
	42m 26s

Provide feedback