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

diff --cc Gemfile.lock
index ee1b533ab1d438384e9c6d830a9472aed4ee86d5,13903837839d67ce0fdc9255010e617f97dd4b57..d5924e95b01beed451418af0cf31ceac03839bf1
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -134,15 -134,9 +134,9 @@@ GE
      composite_primary_keys (12.0.3)
        activerecord (~> 6.0.0)
      concurrent-ruby (1.1.7)
 -    config (2.2.1)
 +    config (2.2.3)
        deep_merge (~> 1.2, >= 1.2.1)
        dry-validation (~> 1.0, >= 1.0.0)
-     coveralls (0.8.23)
-       json (>= 1.8, < 3)
-       simplecov (~> 0.16.1)
-       term-ansicolor (~> 1.3)
-       thor (>= 0.19.4, < 2.0)
-       tins (~> 1.6)
      crack (0.4.4)
      crass (1.0.6)
      dalli (2.7.11)