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

diff --combined Gemfile.lock
index 8a577bfaec53b8837ac2b3473514ab0be9727279,a3e93fc1a63c1e5114aa5def09a978ecddb8335a..c08bc0f20b4ef0b748fb3d0391dedd457154d1c7
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,8 -74,8 +74,8 @@@ GE
      autoprefixer-rails (10.0.1.0)
        execjs
      aws-eventstream (1.1.0)
-     aws-partitions (1.380.0)
-     aws-sdk-core (3.109.0)
+     aws-partitions (1.383.0)
+     aws-sdk-core (3.109.1)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.39.0)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.83.0)
+     aws-sdk-s3 (1.83.1)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -300,7 -300,7 +300,7 @@@
      omniauth (1.9.1)
        hashie (>= 3.4.6)
        rack (>= 1.6.2, < 3)
 -    omniauth-facebook (7.0.0)
 +    omniauth-facebook (8.0.0)
        omniauth-oauth2 (~> 1.2)
      omniauth-github (1.4.0)
        omniauth (~> 1.5)