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

diff --cc Gemfile.lock
index 9af09cc96539db1f5867ddab05944f0391d77fc2,789199ca996a1d961b790acf66134d25298a5df6..ceadafa8d278ee6124433f1a9fd268ff6761d0f7
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,11 -71,11 +71,11 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
-     autoprefixer-rails (9.8.6.3)
+     autoprefixer-rails (10.0.0)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.367.0)
 -    aws-sdk-core (3.105.0)
 +    aws-partitions (1.370.0)
 +    aws-sdk-core (3.107.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)