Merge upstream changes up to b06fd54c305915527e3a6edc575dc23b623143ef #1682

Job	Run time
build (production)	2m 16s
build (test)	1m 29s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 34s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 22s
test (3.2)	7m 55s
End to End testing (3.2)	4m 35s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 45s
Libvips tests (3.2)	3m 48s
test (.ruby-version)	7m 20s
End to End testing (.ruby-version)	4m 5s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 24s
Libvips tests (.ruby-version)	2m 50s
	49m 23s

Provide feedback