Merge remote-tracking branch 'upstream/pull/2949' into master

diff --combined Gemfile.lock
index 30945b73abd888072b536fbe29a33d331441219e,fbde32df6e525ad258276645d8675dece7027d12..77aa0e4d77d97365d9156ab70b29d7084e8be862
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -83,7 -83,7 +83,7 @@@ GE
      aws-sdk-kms (1.39.0)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.83.2)
+     aws-sdk-s3 (1.84.0)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -254,7 -254,7 +254,7 @@@
      kramdown (2.3.0)
        rexml
      libxml-ruby (3.2.1)
 -    listen (3.2.1)
 +    listen (3.3.0)
        rb-fsevent (~> 0.10, >= 0.10.3)
        rb-inotify (~> 0.9, >= 0.9.10)
      logstash-event (1.2.02)