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

diff --combined Gemfile.lock
index 299d62f6220fbe0dc52494d334ee29abc004613a,2828142dcb8c29a3ed995261f2dd2ccf1dd125c4..0843b96a0e33fe476fe0df516a8694fd98f38217
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,8 -74,8 +74,8 @@@ GE
      autoprefixer-rails (9.8.5)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.340.0)
 -    aws-sdk-core (3.103.0)
 +    aws-partitions (1.343.0)
 +    aws-sdk-core (3.104.1)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
@@@ -83,8 -83,8 +83,8 @@@
      aws-sdk-kms (1.36.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.74.0)
 -      aws-sdk-core (~> 3, >= 3.102.1)
 +    aws-sdk-s3 (1.75.0)
 +      aws-sdk-core (~> 3, >= 3.104.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.1)
@@@ -110,6 -110,7 +110,7 @@@
        autoprefixer-rails (>= 9.1.0)
        popper_js (>= 1.14.3, < 2)
        sassc-rails (>= 2.0.0)
+     brakeman (4.8.2)
      browser (4.2.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
@@@ -484,6 -485,7 +485,7 @@@ DEPENDENCIE
    binding_of_caller
    bootsnap (>= 1.4.2)
    bootstrap (~> 4.5.0)
+   brakeman
    browser
    bzip2-ffi
    cancancan