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

diff --combined Gemfile.lock
index 95bebd649f74e25a1067520709312c7bd627f037,3d8a892b042f33163d42df14f7b443db15852189..4081a0cda729ca2ab3cb771e339fc07a93313f68
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -3,35 -3,35 +3,35 @@@ GE
    specs:
      aasm (5.5.0)
        concurrent-ruby (~> 1.0)
 -    actioncable (7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    actioncable (7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        nio4r (~> 2.0)
        websocket-driver (>= 0.6.1)
        zeitwerk (~> 2.6)
 -    actionmailbox (7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      activejob (= 7.1.3.2)
 -      activerecord (= 7.1.3.2)
 -      activestorage (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    actionmailbox (7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      activejob (= 7.1.3.3)
 +      activerecord (= 7.1.3.3)
 +      activestorage (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        mail (>= 2.7.1)
        net-imap
        net-pop
        net-smtp
 -    actionmailer (7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      actionview (= 7.1.3.2)
 -      activejob (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    actionmailer (7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      actionview (= 7.1.3.3)
 +      activejob (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        mail (~> 2.5, >= 2.5.4)
        net-imap
        net-pop
        net-smtp
        rails-dom-testing (~> 2.2)
 -    actionpack (7.1.3.2)
 -      actionview (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    actionpack (7.1.3.3)
 +      actionview (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        nokogiri (>= 1.8.5)
        racc
        rack (>= 2.2.4)
@@@ -41,39 -41,39 +41,39 @@@
        rails-html-sanitizer (~> 1.6)
      actionpack-page_caching (1.2.4)
        actionpack (>= 4.0.0)
 -    actiontext (7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      activerecord (= 7.1.3.2)
 -      activestorage (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    actiontext (7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      activerecord (= 7.1.3.3)
 +      activestorage (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        globalid (>= 0.6.0)
        nokogiri (>= 1.8.5)
 -    actionview (7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    actionview (7.1.3.3)
 +      activesupport (= 7.1.3.3)
        builder (~> 3.1)
        erubi (~> 1.11)
        rails-dom-testing (~> 2.2)
        rails-html-sanitizer (~> 1.6)
      active_record_union (1.3.0)
        activerecord (>= 4.0)
 -    activejob (7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    activejob (7.1.3.3)
 +      activesupport (= 7.1.3.3)
        globalid (>= 0.3.6)
 -    activemodel (7.1.3.2)
 -      activesupport (= 7.1.3.2)
 -    activerecord (7.1.3.2)
 -      activemodel (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    activemodel (7.1.3.3)
 +      activesupport (= 7.1.3.3)
 +    activerecord (7.1.3.3)
 +      activemodel (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        timeout (>= 0.4.0)
      activerecord-import (1.6.0)
        activerecord (>= 4.2)
 -    activestorage (7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      activejob (= 7.1.3.2)
 -      activerecord (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    activestorage (7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      activejob (= 7.1.3.3)
 +      activerecord (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        marcel (~> 1.0)
 -    activesupport (7.1.3.2)
 +    activesupport (7.1.3.3)
        base64
        bigdecimal
        concurrent-ruby (~> 1.0, >= 1.0.2)
@@@ -330,7 -330,7 +330,7 @@@
      mini_portile2 (2.8.6)
      mini_racer (0.9.0)
        libv8-node (~> 18.19.0.0)
 -    minitest (5.22.3)
 +    minitest (5.23.0)
      minitest-focus (1.4.0)
        minitest (>= 4, < 6)
      msgpack (1.7.2)
@@@ -430,20 -430,20 +430,20 @@@
      rackup (1.0.0)
        rack (< 3)
        webrick
 -    rails (7.1.3.2)
 -      actioncable (= 7.1.3.2)
 -      actionmailbox (= 7.1.3.2)
 -      actionmailer (= 7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      actiontext (= 7.1.3.2)
 -      actionview (= 7.1.3.2)
 -      activejob (= 7.1.3.2)
 -      activemodel (= 7.1.3.2)
 -      activerecord (= 7.1.3.2)
 -      activestorage (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    rails (7.1.3.3)
 +      actioncable (= 7.1.3.3)
 +      actionmailbox (= 7.1.3.3)
 +      actionmailer (= 7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      actiontext (= 7.1.3.3)
 +      actionview (= 7.1.3.3)
 +      activejob (= 7.1.3.3)
 +      activemodel (= 7.1.3.3)
 +      activerecord (= 7.1.3.3)
 +      activestorage (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        bundler (>= 1.15.0)
 -      railties (= 7.1.3.2)
 +      railties (= 7.1.3.3)
      rails-controller-testing (1.0.5)
        actionpack (>= 5.0.1.rc1)
        actionview (>= 5.0.1.rc1)
@@@ -461,9 -461,9 +461,9 @@@
      rails_param (1.3.1)
        actionpack (>= 3.2.0)
        activesupport (>= 3.2.0)
 -    railties (7.1.3.2)
 -      actionpack (= 7.1.3.2)
 -      activesupport (= 7.1.3.2)
 +    railties (7.1.3.3)
 +      actionpack (= 7.1.3.3)
 +      activesupport (= 7.1.3.3)
        irb
        rackup (>= 1.0.0)
        rake (>= 12.2)
@@@ -481,7 -481,8 +481,8 @@@
        io-console (~> 0.5)
      request_store (1.7.0)
        rack (>= 1.4)
-     rexml (3.2.6)
+     rexml (3.2.8)
+       strscan (>= 3.0.9)
      rinku (2.0.6)
      rotp (6.3.0)
      rouge (4.2.1)
@@@ -560,6 -561,7 +561,7 @@@
      stringio (3.1.0)
      strong_migrations (1.8.0)
        activerecord (>= 5.2)
+     strscan (3.1.0)
      terminal-table (3.0.2)
        unicode-display_width (>= 1.1.1, < 3)
      terser (1.2.2)