Merge remote-tracking branch 'upstream/pull/2933' into master

diff --combined Gemfile.lock
index 1e8e3d91fd8296cdbe2ef75ce28d08703f679aae,69e32988da250daf4a7b47e7428030fd7850acb6..0592bbff9a3daf7c13000cce51f669f705d6486d
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,7 -71,7 +71,7 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
 -    autoprefixer-rails (10.0.1.1)
 +    autoprefixer-rails (10.0.1.2)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.383.0)
@@@ -104,7 -104,7 +104,7 @@@
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
-     bootsnap (1.4.9)
+     bootsnap (1.5.0)
        msgpack (~> 1.0)
      bootstrap (4.5.2)
        autoprefixer-rails (>= 9.1.0)