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

diff --combined Gemfile.lock
index 6b48d6cf4a1ff1789b570626c6595f65a27007e1,a5c8c364e2ac2ef94756c3a01c2bed1315c440c5..64aba9c978dcf3a63ec63efb8713b6bbf092807f
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,25 -71,25 +71,25 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
 -    autoprefixer-rails (9.8.6.3)
 +    autoprefixer-rails (10.0.0)
        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)
      aws-sigv4 (1.2.2)
        aws-eventstream (~> 1, >= 1.0.2)
-     better_errors (2.7.1)
+     better_errors (2.8.0)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)
@@@ -390,22 -390,22 +390,22 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
 -    rubocop (0.90.0)
 +    rubocop (0.91.0)
        parallel (~> 1.10)
        parser (>= 2.7.1.1)
        rainbow (>= 2.2.2, < 4.0)
        regexp_parser (>= 1.7)
        rexml
 -      rubocop-ast (>= 0.3.0, < 1.0)
 +      rubocop-ast (>= 0.4.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)