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

diff --combined Gemfile.lock
index ae9feea6391bab9aa0459ec505d237d808467de1,5d4a2befc01a787107eaedcd4b45b42a6f88630a..880d287ec15d548997e3c8096f5632bb5dcd100a
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,7 -2,7 +2,7 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
 -    aasm (5.1.0)
 +    aasm (5.1.1)
        concurrent-ruby (~> 1.0)
      actioncable (6.0.3.2)
        actionpack (= 6.0.3.2)
@@@ -104,7 -104,7 +104,7 @@@
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
-     bootsnap (1.4.7)
+     bootsnap (1.4.8)
        msgpack (~> 1.0)
      bootstrap (4.5.2)
        autoprefixer-rails (>= 9.1.0)