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

diff --combined Gemfile.lock
index d5548feb5fb3007d5c7fdb0017f90f8aa512783b,a72428d7d1255616ae1fd0325d97107f70043de8..9af09cc96539db1f5867ddab05944f0391d77fc2
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,16 -74,16 +74,16 @@@ GE
      autoprefixer-rails (9.8.6.3)
        execjs
      aws-eventstream (1.1.0)
-     aws-partitions (1.367.0)
-     aws-sdk-core (3.105.0)
+     aws-partitions (1.370.0)
+     aws-sdk-core (3.107.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
        jmespath (~> 1.0)
-     aws-sdk-kms (1.37.0)
+     aws-sdk-kms (1.38.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.80.0)
+     aws-sdk-s3 (1.81.0)
        aws-sdk-core (~> 3, >= 3.104.3)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -399,13 -399,13 +399,13 @@@
        rubocop-ast (>= 0.3.0, < 1.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 2.0)
 -    rubocop-ast (0.3.0)
 +    rubocop-ast (0.4.0)
        parser (>= 2.7.1.4)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
      rubocop-performance (1.8.0)
        rubocop (>= 0.87.0)
 -    rubocop-rails (2.8.0)
 +    rubocop-rails (2.8.1)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
        rubocop (>= 0.87.0)