Merge upstream changes up to d5f02adad716520b6b9014553bc730dcef5b2f50 #1358

Job	Run time
build (production)	3m 37s
build (test)	3m 47s
End to End testing (3.1)	6m 54s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 0s
End to End testing (3.2)	6m 9s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 39s
test (3.1)	9m 18s
End to End testing (.ruby-version)	6m 44s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 9s
Libvips tests (3.1)	1m 55s
test (3.2)	9m 20s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 13s
Libvips tests (3.2)	2m 6s
test (.ruby-version)	11m 7s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 18s
Libvips tests (.ruby-version)	2m 3s
	1h 19m 19s

Provide feedback