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

diff --combined Gemfile.lock
index 9b4f473bb0c43528441c12686f03d6f98168aa61,aeac9879a9cab12055bb46157b786820bad88966..3b489344aea2e0acf0009cead8120be11cac4523
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -131,7 -131,7 +131,7 @@@ GE
        xpath (~> 3.2)
      childprocess (3.0.0)
      coderay (1.1.3)
 -    composite_primary_keys (12.0.2)
 +    composite_primary_keys (12.0.3)
        activerecord (~> 6.0.0)
      concurrent-ruby (1.1.7)
      config (2.2.1)
@@@ -461,7 -461,7 +461,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
-     webmock (3.9.5)
+     webmock (3.10.0)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)