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

diff --combined Gemfile.lock
index 91b3207f9afed4f5755b64da8776ce9bfc4bf165,fca0597eae39daa7e6cc2dca24263b9360e05f71..2a1e431a3951fe2627a8a6897e3b6589b821f4ec
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -89,7 -89,7 +89,7 @@@ GE
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.2)
        aws-eventstream (~> 1, >= 1.0.2)
-     better_errors (2.9.0)
+     better_errors (2.9.1)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)
@@@ -253,7 -253,7 +253,7 @@@
      kgio (2.11.3)
      kramdown (2.3.0)
        rexml
 -    libxml-ruby (3.2.0)
 +    libxml-ruby (3.2.1)
      listen (3.2.1)
        rb-fsevent (~> 0.10, >= 0.10.3)
        rb-inotify (~> 0.9, >= 0.9.10)