Merge branch 'main' into merge-upstream #232

Job	Run time
build (production)	4m 30s
build (test)	4m 29s
test (3.1)	6m 52s
End to End testing (3.1)	4m 16s
Libvips tests (3.1)	3m 19s
test (3.2)	7m 26s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 32s
End to End testing (3.2)	3m 45s
Libvips tests (3.2)	3m 19s
test (.ruby-version)	7m 45s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	4m 9s
End to End testing (.ruby-version)	2m 46s
Libvips tests (.ruby-version)	3m 40s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 41s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 53s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 41s
	1h 9m 3s

Provide feedback