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

diff --combined Gemfile.lock
index 52ff71f39d4784bd96f97691582b4439786ce117,2bcd67c3d65418ea456fa74f38b393a736d8028c..1ef9c82b5721d8fe719b5cc6629307436f1168ae
--- 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)