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

diff --combined Gemfile.lock
index 1ef9c82b5721d8fe719b5cc6629307436f1168ae,9e950374ed6a8afa9c3ba947c9fa0b071b24dbdc..2eeb85e3b6c5e45afd4a48362cf91b7c85c47f2f
--- 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.0.8)
 +    aasm (5.1.0)
        concurrent-ruby (~> 1.0)
      actioncable (6.0.3.2)
        actionpack (= 6.0.3.2)
@@@ -52,7 -52,7 +52,7 @@@
      activerecord (6.0.3.2)
        activemodel (= 6.0.3.2)
        activesupport (= 6.0.3.2)
 -    activerecord-import (1.0.5)
 +    activerecord-import (1.0.6)
        activerecord (>= 3.2)
      activestorage (6.0.3.2)
        actionpack (= 6.0.3.2)
@@@ -71,7 -71,7 +71,7 @@@
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
-     autoprefixer-rails (9.8.6)
+     autoprefixer-rails (9.8.6.1)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.343.0)