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

diff --combined Gemfile.lock
index 70d88a63bc538680d1678c039c9d886ba15c9527,bc198994a0df8a8d71f5fbfa36963a584353f992..424f4a4eb7db6e8862ce2d5675ba1842947022f0
--- 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.84.0)
 +    aws-sdk-s3 (1.84.1)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -104,7 -104,7 +104,7 @@@
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
-     bootsnap (1.5.0)
+     bootsnap (1.5.1)
        msgpack (~> 1.0)
      bootstrap (4.5.3)
        autoprefixer-rails (>= 9.1.0)