Merge upstream changes up to 877090518682b6c77ba9bdfa0231afd56daec44d #1749

Job	Run time
build (production)	4m 44s
build (test)	4m 32s
test (3.2)	7m 5s
Libvips tests (3.2)	2m 38s
End to End testing (3.2)	4m 59s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	5m 21s
test (.ruby-version)	8m 48s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	6m 37s
Libvips tests (.ruby-version)	2m 49s
End to End testing (.ruby-version)	2m 42s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	4m 14s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 37s
	58m 6s

Provide feedback