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

diff --combined Gemfile.lock
index 9bb897a93581bab2b1a47b266b8449610b0ac3ca,86881405201fd37f13376357202e1ea488aa6a90..59d306eb61898fc5f5635fe03f5673fdd829cf14
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -104,7 -104,7 +104,7 @@@ GE
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
-     bootsnap (1.4.8)
+     bootsnap (1.4.9)
        msgpack (~> 1.0)
      bootstrap (4.5.2)
        autoprefixer-rails (>= 9.1.0)
@@@ -333,7 -333,7 +333,7 @@@
      progress (3.5.2)
      psych (3.2.0)
      public_suffix (4.0.6)
 -    puma (5.0.2)
 +    puma (5.0.3)
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      r2 (0.2.7)