Merge remote-tracking branch 'upstream/pull/2868'

diff --combined Gemfile.lock
index b6a2886c1978f071e1adec12864dcfe5808389b3,eb76ffc305deb19bea4b7101862d8fcbda819f9d..79ebb3f7f74863fa1b8a5dfa89709fdf6c7a1b05
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,17 -74,17 +74,17 @@@ GE
      autoprefixer-rails (10.0.1.0)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.376.0)
 -    aws-sdk-core (3.108.0)
 +    aws-partitions (1.378.0)
 +    aws-sdk-core (3.109.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
        jmespath (~> 1.0)
 -    aws-sdk-kms (1.38.0)
 -      aws-sdk-core (~> 3, >= 3.99.0)
 +    aws-sdk-kms (1.39.0)
 +      aws-sdk-core (~> 3, >= 3.109.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.81.1)
 -      aws-sdk-core (~> 3, >= 3.104.3)
 +    aws-sdk-s3 (1.82.0)
 +      aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.2)
@@@ -389,7 -389,7 +389,7 @@@
        rack (>= 1.4)
      rexml (3.2.4)
      rinku (2.0.6)
-     rotp (6.1.0)
+     rotp (6.2.0)
      rubocop (0.92.0)
        parallel (~> 1.10)
        parser (>= 2.7.1.5)