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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 4de807dcb2450a76d50e5b925ab5d60034b69f13,f77b81a5cf9c17151d7c4b9394fc95fd994c7f4d..96be9e9e103030ded054c136fdc5fe6038b0f226
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -579,11 -548,8 +585,11 @@@ GE
      sass-embedded (1.64.2)
        google-protobuf (~> 3.23)
        rake (>= 13.0.0)
 +    sawyer (0.9.2)
 +      addressable (>= 2.3.5)
 +      faraday (>= 0.17.3, < 3)
      securerandom (0.3.1)
-     selenium-webdriver (4.23.0)
+     selenium-webdriver (4.25.0)
        base64 (~> 0.2)
        logger (~> 1.4)
        rexml (~> 3.2, >= 3.2.5)