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

diff --combined Gemfile.lock
index d8bf51fe56ffa073ac871de335163c2bf6ae667d,9f8447196afd86c4d392886fa37ef23e5bd94460..3b47153b7480abf1a0c6a15f36f5885b25bc2220
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,7 -74,7 +74,7 @@@ GE
      autoprefixer-rails (9.8.4)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.335.0)
 +    aws-partitions (1.336.0)
      aws-sdk-core (3.102.1)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.35.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.71.1)
 +    aws-sdk-s3 (1.72.0)
        aws-sdk-core (~> 3, >= 3.102.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -220,9 -220,9 +220,9 @@@
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
      http_accept_language (2.1.1)
-     i18n (0.9.5)
+     i18n (1.8.3)
        concurrent-ruby (~> 1.0)
 -    i18n-js (3.7.0)
 +    i18n-js (3.7.1)
        i18n (>= 0.6.6)
      image_optim (0.26.5)
        exifr (~> 1.2, >= 1.2.2)
@@@ -246,7 -246,7 +246,7 @@@
      json (2.3.0)
      jwt (2.2.1)
      kgio (2.11.3)
 -    kramdown (2.2.1)
 +    kramdown (2.3.0)
        rexml
      libxml-ruby (3.2.0)
      listen (3.2.1)
@@@ -365,9 -365,9 +365,9 @@@
        nokogiri (>= 1.6)
      rails-html-sanitizer (1.3.0)
        loofah (~> 2.3)
-     rails-i18n (4.0.2)
-       i18n (~> 0.6)
-       rails (>= 4.0)
+     rails-i18n (6.0.0)
+       i18n (>= 0.7, < 2)
+       railties (>= 6.0.0, < 7)
      railties (6.0.3.2)
        actionpack (= 6.0.3.2)
        activesupport (= 6.0.3.2)
@@@ -465,7 -465,7 +465,7 @@@
      websocket-extensions (0.1.5)
      xpath (3.2.0)
        nokogiri (~> 1.8)
-     zeitwerk (2.3.0)
+     zeitwerk (2.3.1)
  
  PLATFORMS
    ruby
@@@ -534,7 -534,7 +534,7 @@@ DEPENDENCIE
    rack-uri_sanitizer
    rails (= 6.0.3.2)
    rails-controller-testing
-   rails-i18n (~> 4.0.0)
+   rails-i18n (~> 6.0.0)
    rinku (>= 2.0.6)
    rotp
    rubocop