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

diff --combined Gemfile.lock
index 6e8a1b78feac0bd8a28d14949dd3e153134db12c,ffe824163ea4b76eeeafc5d0407edd950bec14ca..e28a21f8a7f9b50f431495a4521688f1ad049080
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,7 -71,7 +71,7 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
 -    autoprefixer-rails (10.0.0)
 +    autoprefixer-rails (10.0.0.2)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.370.0)
@@@ -89,7 -89,7 +89,7 @@@
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.2)
        aws-eventstream (~> 1, >= 1.0.2)
-     better_errors (2.8.0)
+     better_errors (2.8.1)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)