diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44e9c5577b0..08991cb9340 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -424,6 +424,11 @@ job_configuration:
     ruby_version: 'ruby-3.3.0'
     image: ghcr.io/datadog/images-rb/engines/ruby:3.3
     resource_class_to_use: medium+
+  - &config-3_4
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'ruby-3.4.0'
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.4
+    resource_class_to_use: medium+
     # ADD NEW RUBIES HERE
   - &config-jruby-9_2 # More recent release of 9.2
     <<: *filters_all_branches_and_tags
@@ -456,6 +461,7 @@ workflows:
             - test-3.1
             - test-3.2
             - test-3.3
+            - test-3.4
             # ADD NEW RUBIES HERE
             - test-jruby-9.2
             - test-jruby-9.3
@@ -504,6 +510,11 @@ workflows:
           integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
           ruby_version: '3.3'
           <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-3.4
+          integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
+          ruby_version: '3.4'
+          <<: *filters_all_branches_and_tags
       # ⬆️ **Note**: If add/remove test apps above, remember to also copy-paste the changes to the "edge" workflow further down the file.
       #
       # ADD NEW RUBIES HERE
@@ -563,6 +574,14 @@ workflows:
           name: test-3.3
           requires:
             - build-3.3
+      - orb/build:
+          <<: *config-3_4
+          name: build-3.4
+      - orb/test:
+          <<: *config-3_4
+          name: test-3.4
+          requires:
+            - build-3.4
       # ADD NEW RUBIES HERE
       - orb/build:
           <<: *config-jruby-9_2
diff --git a/appraisal/ruby-3.4.rb b/appraisal/ruby-3.4.rb
index 43a4e1eb122..6cb1bf51ce2 100644
--- a/appraisal/ruby-3.4.rb
+++ b/appraisal/ruby-3.4.rb
@@ -88,13 +88,20 @@
 build_coverage_matrix('elasticsearch', 7..8)
 
 appraise 'relational_db' do
-  gem 'activerecord', '~> 7'
+  # ActiveRecord locked because tests are failing with 7.1, which was attempted as a part of Ruby 3.4 testing in CI.
+  # All existing relational_db configurations use ActiveRecord 7.0. ActiveRecord 7.1 is tested as a part of rails71
+  # appraisal configurations. The latest version of sqlite3 (i.e. 2+) requires ActiveRecord 7.1, so sqlite3 version
+  # has been locked as well.
+  #
+  # TODO: Repair the failures with ActiveRecord 7.1 in this configuration and remove the locked version.
+  # TODO: After ActiveRecord is upgraded to 7.1+, sqlite3 can be unlocked as well.
+  gem 'activerecord', '~> 7.0.0'
   gem 'delayed_job'
   gem 'delayed_job_active_record'
   gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions
   gem 'mysql2', '>= 0.5.3', platform: :ruby
   gem 'pg', platform: :ruby
-  gem 'sqlite3', '>= 1.4.2', platform: :ruby
+  gem 'sqlite3', '~> 1.4', platform: :ruby
   gem 'sequel'
   gem 'trilogy'
 end
diff --git a/gemfiles/ruby_3.4_activesupport.gemfile b/gemfiles/ruby_3.4_activesupport.gemfile
index c4cc87b658f..68c10a4dc2b 100644
--- a/gemfiles/ruby_3.4_activesupport.gemfile
+++ b/gemfiles/ruby_3.4_activesupport.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "activesupport", "~> 7"
 gem "actionpack"
 gem "actionview"
diff --git a/gemfiles/ruby_3.4_activesupport.gemfile.lock b/gemfiles/ruby_3.4_activesupport.gemfile.lock
index 843f3f6375f..e3f624a8df9 100644
--- a/gemfiles/ruby_3.4_activesupport.gemfile.lock
+++ b/gemfiles/ruby_3.4_activesupport.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -110,7 +110,7 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     grape (2.1.2)
       activesupport (>= 6)
@@ -269,7 +269,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stringio (3.1.1)
-    strscan (3.1.1)
     thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -280,6 +279,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     zeitwerk (2.6.16)
 
 PLATFORMS
@@ -292,18 +292,22 @@ DEPENDENCIES
   active_model_serializers (>= 0.10.0)
   activesupport (~> 7)
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   grape
   json-schema (< 3)
   lograge
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -324,10 +328,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_aws.gemfile b/gemfiles/ruby_3.4_aws.gemfile
index 51875452d4b..be021dcab03 100644
--- a/gemfiles/ruby_3.4_aws.gemfile
+++ b/gemfiles/ruby_3.4_aws.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "aws-sdk"
 gem "shoryuken"
 
diff --git a/gemfiles/ruby_3.4_aws.gemfile.lock b/gemfiles/ruby_3.4_aws.gemfile.lock
index 92a83f2247c..2ee4937bf1b 100644
--- a/gemfiles/ruby_3.4_aws.gemfile.lock
+++ b/gemfiles/ruby_3.4_aws.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -1582,6 +1582,7 @@ GEM
     aws-sigv2 (1.2.0)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -1600,7 +1601,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     jmespath (1.6.2)
@@ -1617,6 +1618,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -1694,7 +1696,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -1703,6 +1704,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -1711,16 +1713,20 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 2.4.0)
   aws-sdk
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -1740,10 +1746,11 @@ DEPENDENCIES
   shoryuken
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_contrib.gemfile b/gemfiles/ruby_3.4_contrib.gemfile
index cedcf4bced0..74b33a9d01e 100644
--- a/gemfiles/ruby_3.4_contrib.gemfile
+++ b/gemfiles/ruby_3.4_contrib.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "dalli", ">= 3.0.0"
 gem "grpc", ">= 1.38.0", platform: :ruby
 gem "mongo", ">= 2.8.0", "< 2.15.0"
diff --git a/gemfiles/ruby_3.4_contrib.gemfile.lock b/gemfiles/ruby_3.4_contrib.gemfile.lock
index fc88116634e..3508d8021f2 100644
--- a/gemfiles/ruby_3.4_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.4_contrib.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -60,7 +60,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     googleapis-common-protos-types (1.15.0)
       google-protobuf (>= 3.18, < 5.a)
@@ -87,6 +87,7 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -212,7 +213,6 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    strscan (3.1.1)
     sucker_punch (3.2.0)
       concurrent-ruby (~> 1.0)
     thor (1.3.1)
@@ -224,6 +224,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -231,19 +232,23 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   dalli (>= 3.0.0)
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   grpc (>= 1.38.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
   mongo (>= 2.8.0, < 2.15.0)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -270,11 +275,12 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sneakers (>= 2.12.0)
+  strscan!
   sucker_punch
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_contrib_old.gemfile b/gemfiles/ruby_3.4_contrib_old.gemfile
index e912b4cd1ec..89086215dca 100644
--- a/gemfiles/ruby_3.4_contrib_old.gemfile
+++ b/gemfiles/ruby_3.4_contrib_old.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "dalli", "< 3.0.0"
 gem "presto-client", ">= 0.5.14"
 gem "qless", "0.12.0"
diff --git a/gemfiles/ruby_3.4_contrib_old.gemfile.lock b/gemfiles/ruby_3.4_contrib_old.gemfile.lock
index a1b235872f6..29e696cbf10 100644
--- a/gemfiles/ruby_3.4_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.4_contrib_old.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -37,6 +37,7 @@ GEM
     atomic (1.1.101)
     avl_tree (1.2.1)
       atomic (~> 1.1)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -62,7 +63,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     hitimes (1.3.1)
@@ -86,6 +87,7 @@ GEM
     multipart-post (2.4.1)
     mustermann (1.1.2)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -187,7 +189,6 @@ GEM
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
     statsd-ruby (1.5.0)
-    strscan (3.1.1)
     thin (1.8.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -203,6 +204,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -210,17 +212,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   dalli (< 3.0.0)
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   presto-client (>= 0.5.14)
@@ -242,10 +248,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_core_old.gemfile b/gemfiles/ruby_3.4_core_old.gemfile
index 2da26276388..2efab789c0d 100644
--- a/gemfiles/ruby_3.4_core_old.gemfile
+++ b/gemfiles/ruby_3.4_core_old.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", "~> 4"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 
 group :check do
   gem "ruby_memcheck", ">= 3"
diff --git a/gemfiles/ruby_3.4_core_old.gemfile.lock b/gemfiles/ruby_3.4_core_old.gemfile.lock
index ceced453e24..f439224e4b0 100644
--- a/gemfiles/ruby_3.4_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.4_core_old.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -141,7 +143,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -150,6 +151,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -157,16 +159,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (~> 4)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -185,10 +191,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_elasticsearch_7.gemfile b/gemfiles/ruby_3.4_elasticsearch_7.gemfile
index d23cbc59c54..c0d8eac57ac 100644
--- a/gemfiles/ruby_3.4_elasticsearch_7.gemfile
+++ b/gemfiles/ruby_3.4_elasticsearch_7.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "elasticsearch", "~> 7"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
index a1cc6dbb1d6..14d68f786fe 100644
--- a/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -68,7 +68,7 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.8.1)
@@ -86,6 +86,7 @@ GEM
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     net-http (0.5.0)
       uri
     nokogiri (1.16.7)
@@ -161,7 +162,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -170,6 +170,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -177,17 +178,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   elasticsearch (~> 7)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -206,10 +211,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_elasticsearch_8.gemfile b/gemfiles/ruby_3.4_elasticsearch_8.gemfile
index f30dfa746c3..b2f1fecb3cb 100644
--- a/gemfiles/ruby_3.4_elasticsearch_8.gemfile
+++ b/gemfiles/ruby_3.4_elasticsearch_8.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "elasticsearch", "~> 8"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
index ae47bf233a2..579ffbb3a28 100644
--- a/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -66,7 +67,7 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.8.1)
@@ -84,6 +85,7 @@ GEM
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     net-http (0.5.0)
       uri
     nokogiri (1.16.7)
@@ -159,7 +161,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -168,6 +169,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -175,17 +177,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   elasticsearch (~> 8)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -204,10 +210,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile
index 7235a23107c..772a63e2ba9 100644
--- a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile
+++ b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "elasticsearch"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
index e4fe9af9ed3..27bcf2206d6 100644
--- a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -66,7 +67,7 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.8.1)
@@ -84,6 +85,7 @@ GEM
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     net-http (0.5.0)
       uri
     nokogiri (1.16.7)
@@ -166,6 +168,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -173,17 +176,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   elasticsearch
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -202,10 +209,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_graphql_1.13.gemfile b/gemfiles/ruby_3.4_graphql_1.13.gemfile
index 6d0868dcbed..a3973217c89 100644
--- a/gemfiles/ruby_3.4_graphql_1.13.gemfile
+++ b/gemfiles/ruby_3.4_graphql_1.13.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,11 +33,15 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m", ">= 0.1.0"
 gem "rails", "~> 6.1.0"
 gem "graphql", "~> 1.13.0"
 gem "sprockets", "< 4"
 gem "lograge", "~> 0.11"
-gem "mutex_m", ">= 0.1.0"
 
 group :check do
   gem "ruby_memcheck", ">= 3"
diff --git a/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
index 3b690fa1402..ae1930bcb5b 100644
--- a/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -278,7 +278,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -290,6 +289,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -301,13 +301,16 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   graphql (~> 1.13.0)
   json-schema (< 3)
@@ -334,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_graphql_2.0.gemfile b/gemfiles/ruby_3.4_graphql_2.0.gemfile
index 97b1887fdf0..84c245908da 100644
--- a/gemfiles/ruby_3.4_graphql_2.0.gemfile
+++ b/gemfiles/ruby_3.4_graphql_2.0.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,11 +33,15 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m", ">= 0.1.0"
 gem "rails", "~> 6.1.0"
 gem "graphql", "~> 2.0.0"
 gem "sprockets", "< 4"
 gem "lograge", "~> 0.11"
-gem "mutex_m", ">= 0.1.0"
 
 group :check do
   gem "ruby_memcheck", ">= 3"
diff --git a/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
index df2d7ef1367..3fcf56ddd86 100644
--- a/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -278,7 +278,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -290,6 +289,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -301,13 +301,16 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   graphql (~> 2.0.0)
   json-schema (< 3)
@@ -334,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_graphql_2.1.gemfile b/gemfiles/ruby_3.4_graphql_2.1.gemfile
index 0b9a3c4f9b6..9d124cda1b5 100644
--- a/gemfiles/ruby_3.4_graphql_2.1.gemfile
+++ b/gemfiles/ruby_3.4_graphql_2.1.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,11 +33,15 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m", ">= 0.1.0"
 gem "rails", "~> 6.1.0"
 gem "graphql", "~> 2.1.0"
 gem "sprockets", "< 4"
 gem "lograge", "~> 0.11"
-gem "mutex_m", ">= 0.1.0"
 
 group :check do
   gem "ruby_memcheck", ">= 3"
diff --git a/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock
index 9bd28b06fea..e46b633eac3 100644
--- a/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -278,7 +278,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -290,6 +289,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -301,13 +301,16 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   graphql (~> 2.1.0)
   json-schema (< 3)
@@ -334,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_graphql_2.2.gemfile b/gemfiles/ruby_3.4_graphql_2.2.gemfile
index 388d0584a02..52c5fe54dbb 100644
--- a/gemfiles/ruby_3.4_graphql_2.2.gemfile
+++ b/gemfiles/ruby_3.4_graphql_2.2.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,11 +33,15 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m", ">= 0.1.0"
 gem "rails", "~> 6.1.0"
 gem "graphql", "~> 2.2.0"
 gem "sprockets", "< 4"
 gem "lograge", "~> 0.11"
-gem "mutex_m", ">= 0.1.0"
 
 group :check do
   gem "ruby_memcheck", ">= 3"
diff --git a/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock
index fccbff4d035..3cfb0b2d9e4 100644
--- a/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -278,7 +278,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -290,6 +289,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -301,13 +301,16 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   graphql (~> 2.2.0)
   json-schema (< 3)
@@ -334,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_graphql_2.3.gemfile b/gemfiles/ruby_3.4_graphql_2.3.gemfile
index f2174aaa276..b532233c9f9 100644
--- a/gemfiles/ruby_3.4_graphql_2.3.gemfile
+++ b/gemfiles/ruby_3.4_graphql_2.3.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,11 +33,15 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m", ">= 0.1.0"
 gem "rails", "~> 6.1.0"
 gem "graphql", "~> 2.3.0"
 gem "sprockets", "< 4"
 gem "lograge", "~> 0.11"
-gem "mutex_m", ">= 0.1.0"
 
 group :check do
   gem "ruby_memcheck", ">= 3"
diff --git a/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock
index c5ff15c5994..03d88e0c89f 100644
--- a/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -278,7 +278,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -290,6 +289,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -301,13 +301,16 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   graphql (~> 2.3.0)
   json-schema (< 3)
@@ -334,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_http.gemfile b/gemfiles/ruby_3.4_http.gemfile
index e97f753c98a..fff5c0050a4 100644
--- a/gemfiles/ruby_3.4_http.gemfile
+++ b/gemfiles/ruby_3.4_http.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "ethon"
 gem "excon"
 gem "faraday"
diff --git a/gemfiles/ruby_3.4_http.gemfile.lock b/gemfiles/ruby_3.4_http.gemfile.lock
index c7ac1d6d99f..1595a416919 100644
--- a/gemfiles/ruby_3.4_http.gemfile.lock
+++ b/gemfiles/ruby_3.4_http.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -61,7 +61,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -97,6 +97,7 @@ GEM
     mime-types-data (3.2024.0604)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     netrc (0.11.0)
@@ -178,7 +179,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
@@ -189,6 +189,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -196,8 +197,10 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
@@ -206,11 +209,13 @@ DEPENDENCIES
   excon
   extlz4 (~> 0.3, >= 0.3.3)
   faraday
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   http
   httpclient
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -230,11 +235,12 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   typhoeus
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_opensearch_2.gemfile b/gemfiles/ruby_3.4_opensearch_2.gemfile
index bb4c3fb2f3c..084bb30fc49 100644
--- a/gemfiles/ruby_3.4_opensearch_2.gemfile
+++ b/gemfiles/ruby_3.4_opensearch_2.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "opensearch-ruby", "~> 2"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_opensearch_2.gemfile.lock b/gemfiles/ruby_3.4_opensearch_2.gemfile.lock
index 7e2c0edf1f6..9abf3ab29fe 100644
--- a/gemfiles/ruby_3.4_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_3.4_opensearch_2.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -58,7 +59,7 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.8.1)
@@ -76,6 +77,7 @@ GEM
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     net-http (0.5.0)
       uri
     nokogiri (1.16.7)
@@ -159,7 +161,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -168,6 +169,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -175,16 +177,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   opensearch-ruby (~> 2)
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
@@ -204,10 +210,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_opensearch_3.gemfile b/gemfiles/ruby_3.4_opensearch_3.gemfile
index f8a01747e32..258960b5555 100644
--- a/gemfiles/ruby_3.4_opensearch_3.gemfile
+++ b/gemfiles/ruby_3.4_opensearch_3.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "opensearch-ruby", "~> 3"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_opensearch_3.gemfile.lock b/gemfiles/ruby_3.4_opensearch_3.gemfile.lock
index e2312147bc4..96d5a0bddd3 100644
--- a/gemfiles/ruby_3.4_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_opensearch_3.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -58,7 +59,7 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.8.1)
@@ -76,6 +77,7 @@ GEM
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     net-http (0.5.0)
       uri
     nokogiri (1.16.7)
@@ -154,7 +156,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -163,6 +164,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -170,16 +172,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   opensearch-ruby (~> 3)
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
@@ -199,10 +205,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_opensearch_latest.gemfile b/gemfiles/ruby_3.4_opensearch_latest.gemfile
index 072a750d612..6d1a231828f 100644
--- a/gemfiles/ruby_3.4_opensearch_latest.gemfile
+++ b/gemfiles/ruby_3.4_opensearch_latest.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "opensearch-ruby"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock
index 1f722a3927c..12b0dddc3db 100644
--- a/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -58,7 +59,7 @@ GEM
       logger
     faraday-net_http (3.3.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.8.1)
@@ -76,6 +77,7 @@ GEM
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     net-http (0.5.0)
       uri
     nokogiri (1.16.7)
@@ -161,6 +163,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -168,16 +171,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   opensearch-ruby
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
@@ -197,10 +204,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_opentelemetry.gemfile b/gemfiles/ruby_3.4_opentelemetry.gemfile
index dcfc8644b7f..b8957072bc9 100644
--- a/gemfiles/ruby_3.4_opentelemetry.gemfile
+++ b/gemfiles/ruby_3.4_opentelemetry.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "opentelemetry-sdk", "~> 1.1"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_opentelemetry.gemfile.lock b/gemfiles/ruby_3.4_opentelemetry.gemfile.lock
index aceffb46103..8be76e4ec96 100644
--- a/gemfiles/ruby_3.4_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.4_opentelemetry.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -153,7 +155,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -162,6 +163,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -169,16 +171,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   opentelemetry-sdk (~> 1.1)
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
@@ -198,10 +204,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile b/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile
index 1c3835717bd..9b788b2d999 100644
--- a/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile
+++ b/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "opentelemetry-sdk", "~> 1.1"
 gem "opentelemetry-exporter-otlp"
 
diff --git a/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock
index 3ecbc214aa5..cef001f9043 100644
--- a/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.5)
     googleapis-common-protos-types (1.16.0)
       google-protobuf (>= 3.18, < 5.a)
@@ -70,6 +71,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.3)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -169,6 +171,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -176,16 +179,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   opentelemetry-exporter-otlp
   opentelemetry-sdk (~> 1.1)
   os (~> 1.1)
@@ -206,10 +213,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rack_2.gemfile b/gemfiles/ruby_3.4_rack_2.gemfile
index b0a1f9f40d2..bb1845b10a8 100644
--- a/gemfiles/ruby_3.4_rack_2.gemfile
+++ b/gemfiles/ruby_3.4_rack_2.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rack", "~> 2"
 gem "rack-contrib"
 gem "rack-test"
diff --git a/gemfiles/ruby_3.4_rack_2.gemfile.lock b/gemfiles/ruby_3.4_rack_2.gemfile.lock
index a1417a72055..b7e93bdb392 100644
--- a/gemfiles/ruby_3.4_rack_2.gemfile.lock
+++ b/gemfiles/ruby_3.4_rack_2.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -146,7 +148,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -155,6 +156,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -162,16 +164,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -193,10 +199,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rack_3.gemfile b/gemfiles/ruby_3.4_rack_3.gemfile
index 596143f36b8..ce5078b0156 100644
--- a/gemfiles/ruby_3.4_rack_3.gemfile
+++ b/gemfiles/ruby_3.4_rack_3.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rack", "~> 3"
 gem "rack-contrib"
 gem "rack-test"
diff --git a/gemfiles/ruby_3.4_rack_3.gemfile.lock b/gemfiles/ruby_3.4_rack_3.gemfile.lock
index ab217554bbc..14167b413e5 100644
--- a/gemfiles/ruby_3.4_rack_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_rack_3.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -146,7 +148,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -155,6 +156,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -162,16 +164,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -193,10 +199,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rack_latest.gemfile b/gemfiles/ruby_3.4_rack_latest.gemfile
index a087755fbd0..e2c31aeae38 100644
--- a/gemfiles/ruby_3.4_rack_latest.gemfile
+++ b/gemfiles/ruby_3.4_rack_latest.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rack"
 gem "rack-contrib"
 gem "rack-test"
diff --git a/gemfiles/ruby_3.4_rack_latest.gemfile.lock b/gemfiles/ruby_3.4_rack_latest.gemfile.lock
index 342db8be64c..b8d2cf2ce5e 100644
--- a/gemfiles/ruby_3.4_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_rack_latest.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.5)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -153,6 +155,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -160,16 +163,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -191,10 +198,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails61_mysql2.gemfile b/gemfiles/ruby_3.4_rails61_mysql2.gemfile
index 780df2a4b1f..009857dbb43 100644
--- a/gemfiles/ruby_3.4_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_3.4_rails61_mysql2.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 6.1.0"
 gem "mysql2", "~> 0.5", platform: :ruby
 gem "sprockets", "< 4"
diff --git a/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock
index 58e13b66734..8a2b634eb70 100644
--- a/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -152,6 +152,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     mysql2 (0.5.6)
     net-imap (0.4.14)
       date
@@ -276,7 +277,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -288,6 +288,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -299,17 +300,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   lograge (~> 0.11)
   memory_profiler (~> 0.9)
+  mutex_m
   mysql2 (~> 0.5)
   net-smtp
   os (~> 1.1)
@@ -332,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails61_postgres.gemfile b/gemfiles/ruby_3.4_rails61_postgres.gemfile
index e13aaddbcbb..4ace92ca6f4 100644
--- a/gemfiles/ruby_3.4_rails61_postgres.gemfile
+++ b/gemfiles/ruby_3.4_rails61_postgres.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 6.1.0"
 gem "pg", ">= 1.1", platform: :ruby
 gem "sprockets", "< 4"
diff --git a/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock
index 9190fb44f19..7b791d83d95 100644
--- a/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -152,6 +152,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-imap (0.4.14)
       date
       net-protocol
@@ -276,7 +277,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -288,6 +288,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -299,17 +300,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   lograge (~> 0.11)
   memory_profiler (~> 0.9)
+  mutex_m
   net-smtp
   os (~> 1.1)
   pg (>= 1.1)
@@ -332,10 +337,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile
index 65e120a303b..4ffc6245de5 100644
--- a/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 6.1.0"
 gem "pg", ">= 1.1", platform: :ruby
 gem "redis", "~> 4"
diff --git a/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock
index 4e4438e80fe..ad68c6e13de 100644
--- a/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -152,6 +152,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-imap (0.4.14)
       date
       net-protocol
@@ -277,7 +278,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -289,6 +289,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -300,17 +301,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   lograge (~> 0.11)
   memory_profiler (~> 0.9)
+  mutex_m
   net-smtp
   os (~> 1.1)
   pg (>= 1.1)
@@ -334,10 +339,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile
index 3b02ad6e742..1102e9598c1 100644
--- a/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 6.1.0"
 gem "pg", ">= 1.1", platform: :ruby
 gem "sidekiq", ">= 6.1.2"
diff --git a/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock
index ca73be72583..0ba1ce5e3fd 100644
--- a/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -117,7 +117,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -153,6 +153,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-imap (0.4.14)
       date
       net-protocol
@@ -290,7 +291,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -302,6 +302,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -313,17 +314,21 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   lograge (~> 0.11)
   memory_profiler (~> 0.9)
+  mutex_m
   net-smtp
   os (~> 1.1)
   pg (>= 1.1)
@@ -348,10 +353,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile
index 146aa81df68..b8d8dfe3aba 100644
--- a/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 6.1.0"
 gem "pg", ">= 1.1", platform: :ruby
 gem "sprockets", "< 4"
diff --git a/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock
index 287507d7dbb..f89e9d0b7e5 100644
--- a/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -116,7 +116,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -147,6 +147,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-imap (0.4.14)
       date
       net-protocol
@@ -275,7 +276,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -287,6 +287,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -298,16 +299,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   net-smtp
   os (~> 1.1)
   pg (>= 1.1)
@@ -331,10 +336,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails61_trilogy.gemfile b/gemfiles/ruby_3.4_rails61_trilogy.gemfile
index 6da08c152ee..86b67f09cda 100644
--- a/gemfiles/ruby_3.4_rails61_trilogy.gemfile
+++ b/gemfiles/ruby_3.4_rails61_trilogy.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 6.1.0"
 gem "trilogy"
 gem "activerecord-trilogy-adapter"
diff --git a/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock
index d7d91fd4721..bd76f5182ed 100644
--- a/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -119,7 +119,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
@@ -155,6 +155,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.24.0)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-imap (0.4.14)
       date
       net-protocol
@@ -278,7 +279,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     trilogy (2.8.1)
@@ -291,6 +291,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -303,17 +304,21 @@ PLATFORMS
 DEPENDENCIES
   activerecord-trilogy-adapter
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   lograge (~> 0.11)
   memory_profiler (~> 0.9)
+  mutex_m
   net-smtp
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
@@ -335,11 +340,12 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sprockets (< 4)
+  strscan!
   trilogy
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails7.gemfile b/gemfiles/ruby_3.4_rails7.gemfile
index 3fe236cf57f..63e135925f5 100644
--- a/gemfiles/ruby_3.4_rails7.gemfile
+++ b/gemfiles/ruby_3.4_rails7.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 7.0.0"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_rails7.gemfile.lock b/gemfiles/ruby_3.4_rails7.gemfile.lock
index 6694a47cead..c529662282b 100644
--- a/gemfiles/ruby_3.4_rails7.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails7.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -99,6 +99,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -121,7 +122,7 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
@@ -155,6 +156,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.25.1)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     net-imap (0.4.14)
       date
       net-protocol
@@ -268,7 +270,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -280,6 +281,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -292,16 +294,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -321,10 +327,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_rails71.gemfile b/gemfiles/ruby_3.4_rails71.gemfile
index 8a40eced18a..422b50b1d75 100644
--- a/gemfiles/ruby_3.4_rails71.gemfile
+++ b/gemfiles/ruby_3.4_rails71.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "rails", "~> 7.1.0"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_rails71.gemfile.lock b/gemfiles/ruby_3.4_rails71.gemfile.lock
index c376923a666..ba20806b23d 100644
--- a/gemfiles/ruby_3.4_rails71.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails71.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -133,7 +133,7 @@ GEM
     drb (2.2.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
@@ -298,7 +298,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stringio (3.1.1)
-    strscan (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -310,6 +309,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -322,16 +322,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -351,10 +355,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_redis_3.gemfile b/gemfiles/ruby_3.4_redis_3.gemfile
index bc59fb8a58c..41db89fec59 100644
--- a/gemfiles/ruby_3.4_redis_3.gemfile
+++ b/gemfiles/ruby_3.4_redis_3.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "redis", "~> 3"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_redis_3.gemfile.lock b/gemfiles/ruby_3.4_redis_3.gemfile.lock
index a4309c002ff..fee8a9baeec 100644
--- a/gemfiles/ruby_3.4_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_redis_3.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_redis_4.gemfile b/gemfiles/ruby_3.4_redis_4.gemfile
index d172e728070..a5c205c5b0f 100644
--- a/gemfiles/ruby_3.4_redis_4.gemfile
+++ b/gemfiles/ruby_3.4_redis_4.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "redis", "~> 4"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_redis_4.gemfile.lock b/gemfiles/ruby_3.4_redis_4.gemfile.lock
index 9eae8593be9..a490e8ca26b 100644
--- a/gemfiles/ruby_3.4_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.4_redis_4.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_redis_5.gemfile b/gemfiles/ruby_3.4_redis_5.gemfile
index 1329a1f9deb..b94c299f499 100644
--- a/gemfiles/ruby_3.4_redis_5.gemfile
+++ b/gemfiles/ruby_3.4_redis_5.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "redis", "~> 5"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_redis_5.gemfile.lock b/gemfiles/ruby_3.4_redis_5.gemfile.lock
index c49f60dd62a..0705959e45d 100644
--- a/gemfiles/ruby_3.4_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.4_redis_5.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -53,7 +54,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -69,6 +70,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -146,7 +148,6 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.1)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -155,6 +156,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -162,16 +164,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -191,10 +197,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_relational_db.gemfile b/gemfiles/ruby_3.4_relational_db.gemfile
index ca56fed0cc7..20778c153b8 100644
--- a/gemfiles/ruby_3.4_relational_db.gemfile
+++ b/gemfiles/ruby_3.4_relational_db.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,13 +33,18 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
-gem "activerecord", "~> 7"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
+gem "activerecord", "~> 7.0.0"
 gem "delayed_job"
 gem "delayed_job_active_record"
 gem "makara", ">= 0.6.0.pre"
 gem "mysql2", ">= 0.5.3", platform: :ruby
 gem "pg", platform: :ruby
-gem "sqlite3", ">= 1.4.2", platform: :ruby
+gem "sqlite3", "~> 1.4", platform: :ruby
 gem "sequel"
 gem "trilogy"
 
diff --git a/gemfiles/ruby_3.4_relational_db.gemfile.lock b/gemfiles/ruby_3.4_relational_db.gemfile.lock
index 58979fa5f0b..30567b80f49 100644
--- a/gemfiles/ruby_3.4_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.4_relational_db.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -27,21 +27,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      timeout (>= 0.4.0)
-    activesupport (7.1.3.4)
-      base64
-      bigdecimal
+    activemodel (7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activerecord (7.0.8.6)
+      activemodel (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activesupport (7.0.8.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
-      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -51,7 +45,7 @@ GEM
       thor (>= 0.14.0)
     ast (2.4.2)
     base64 (0.2.0)
-    benchmark-ips (2.13.0)
+    benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
     bigdecimal (3.1.8)
@@ -59,29 +53,27 @@ GEM
       debug_inspector (>= 1.2.0)
     climate_control (0.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.4)
     crack (1.0.0)
       bigdecimal
       rexml
     datadog-ruby_core_source (3.3.6)
     debug_inspector (1.2.0)
-    delayed_job (4.1.11)
-      activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.8)
-      activerecord (>= 3.0, < 8.0)
+    delayed_job (4.1.13)
+      activesupport (>= 3.0, < 9.0)
+    delayed_job_active_record (4.1.11)
+      activerecord (>= 3.0, < 9.0)
       delayed_job (>= 3.0, < 5)
     diff-lcs (1.5.1)
-    docile (1.4.0)
-    dogstatsd-ruby (5.6.1)
-    drb (2.2.1)
+    docile (1.4.1)
+    dogstatsd-ruby (5.6.3)
     extlz4 (0.3.4)
-    ffi (1.17.0)
-    google-protobuf (3.25.3)
-    hashdiff (1.1.0)
-    i18n (1.14.5)
+    ffi (1.16.3)
+    google-protobuf (3.25.5)
+    hashdiff (1.1.2)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.8.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (14.1.0.1.0-aarch64-linux)
@@ -95,19 +87,19 @@ GEM
     memory_profiler (0.9.14)
     method_source (1.1.0)
     mini_portile2 (2.8.7)
-    minitest (5.24.0)
-    msgpack (1.7.2)
+    minitest (5.25.1)
+    msgpack (1.7.5)
     mutex_m (0.2.0)
     mysql2 (0.5.6)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     os (1.1.4)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
+    pg (1.5.9)
     pimpmychangelog (0.1.3)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -115,27 +107,26 @@ GEM
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
-    public_suffix (6.0.0)
-    racc (1.8.0)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    rake-compiler (1.2.7)
+    rake-compiler (1.2.8)
       rake
     regexp_parser (2.9.2)
-    rexml (3.3.1)
-      strscan
+    rexml (3.3.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
@@ -153,13 +144,13 @@ GEM
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (2.20.0)
@@ -168,38 +159,39 @@ GEM
     ruby-progressbar (1.13.0)
     ruby_memcheck (3.0.0)
       nokogiri
-    sequel (5.83.1)
+    sequel (5.86.0)
       bigdecimal
     simplecov-cobertura (2.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (2.0.2)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    strscan (3.1.1)
-    thor (1.3.1)
-    timeout (0.4.1)
-    trilogy (2.8.1)
+    thor (1.3.2)
+    trilogy (2.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uri (0.13.1)
     warning (1.4.0)
-    webmock (3.23.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (~> 7)
+  activerecord (~> 7.0.0)
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
@@ -207,10 +199,12 @@ DEPENDENCIES
   delayed_job_active_record
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   makara (>= 0.6.0.pre)
   memory_profiler (~> 0.9)
+  mutex_m
   mysql2 (>= 0.5.3)
   os (~> 1.1)
   pg
@@ -232,12 +226,13 @@ DEPENDENCIES
   sequel
   simplecov!
   simplecov-cobertura (~> 2.1.0)
-  sqlite3 (>= 1.4.2)
+  sqlite3 (~> 1.4)
+  strscan!
   trilogy
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_resque2_redis3.gemfile b/gemfiles/ruby_3.4_resque2_redis3.gemfile
index 334051ce6e5..d323cce3ea6 100644
--- a/gemfiles/ruby_3.4_resque2_redis3.gemfile
+++ b/gemfiles/ruby_3.4_resque2_redis3.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "redis", "< 4.0"
 gem "resque", ">= 2.0"
 
diff --git a/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock
index d14de58f314..9d03050aecf 100644
--- a/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -53,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -73,6 +73,7 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -167,7 +168,6 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    strscan (3.1.1)
     thor (1.3.1)
     tilt (2.4.0)
     unicode-display_width (2.5.0)
@@ -177,6 +177,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -184,16 +185,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -214,10 +219,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_resque2_redis4.gemfile b/gemfiles/ruby_3.4_resque2_redis4.gemfile
index 6e73c2e3d6a..8053a928653 100644
--- a/gemfiles/ruby_3.4_resque2_redis4.gemfile
+++ b/gemfiles/ruby_3.4_resque2_redis4.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "redis", ">= 4.0"
 gem "resque", ">= 2.0"
 
diff --git a/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock
index fb1471781af..1353a470499 100644
--- a/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -54,7 +54,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -74,6 +74,7 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -171,7 +172,6 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    strscan (3.1.1)
     thor (1.3.1)
     tilt (2.4.0)
     unicode-display_width (2.5.0)
@@ -181,6 +181,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -188,16 +189,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -218,10 +223,11 @@ DEPENDENCIES
   ruby_memcheck (>= 3)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_sinatra_2.gemfile b/gemfiles/ruby_3.4_sinatra_2.gemfile
index 4a7bef9daa4..afba16a209d 100644
--- a/gemfiles/ruby_3.4_sinatra_2.gemfile
+++ b/gemfiles/ruby_3.4_sinatra_2.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "sinatra", "~> 2"
 gem "rack-contrib"
 gem "rack-test"
diff --git a/gemfiles/ruby_3.4_sinatra_2.gemfile.lock b/gemfiles/ruby_3.4_sinatra_2.gemfile.lock
index caa8189b134..7841448b5f1 100644
--- a/gemfiles/ruby_3.4_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_3.4_sinatra_2.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -70,6 +71,7 @@ GEM
     msgpack (1.7.2)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -156,7 +158,6 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.2.4)
       tilt (~> 2.0)
-    strscan (3.1.1)
     thor (1.3.1)
     tilt (2.4.0)
     unicode-display_width (2.5.0)
@@ -166,6 +167,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -173,16 +175,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -204,10 +210,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sinatra (~> 2)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_sinatra_3.gemfile b/gemfiles/ruby_3.4_sinatra_3.gemfile
index 6d66c9c2ea7..27d068a534b 100644
--- a/gemfiles/ruby_3.4_sinatra_3.gemfile
+++ b/gemfiles/ruby_3.4_sinatra_3.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "sinatra", "~> 3"
 gem "rack-contrib"
 gem "rack-test"
diff --git a/gemfiles/ruby_3.4_sinatra_3.gemfile.lock b/gemfiles/ruby_3.4_sinatra_3.gemfile.lock
index 8e611c230c7..85d7f4ff642 100644
--- a/gemfiles/ruby_3.4_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_sinatra_3.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -53,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -71,6 +71,7 @@ GEM
     msgpack (1.7.2)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -158,7 +159,6 @@ GEM
       rack (~> 2.2, >= 2.2.4)
       rack-protection (= 3.2.0)
       tilt (~> 2.0)
-    strscan (3.1.1)
     thor (1.3.1)
     tilt (2.4.0)
     unicode-display_width (2.5.0)
@@ -168,6 +168,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -175,16 +176,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -206,10 +211,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sinatra (~> 3)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_sinatra_4.gemfile b/gemfiles/ruby_3.4_sinatra_4.gemfile
index a972c875ae0..9538e9a02f1 100644
--- a/gemfiles/ruby_3.4_sinatra_4.gemfile
+++ b/gemfiles/ruby_3.4_sinatra_4.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "sinatra", "~> 4"
 gem "rack-contrib"
 gem "rack-test"
diff --git a/gemfiles/ruby_3.4_sinatra_4.gemfile.lock b/gemfiles/ruby_3.4_sinatra_4.gemfile.lock
index 2d816bf1991..dd7a2ca548a 100644
--- a/gemfiles/ruby_3.4_sinatra_4.gemfile.lock
+++ b/gemfiles/ruby_3.4_sinatra_4.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -53,7 +53,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
@@ -71,6 +71,7 @@ GEM
     msgpack (1.7.2)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -161,7 +162,6 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    strscan (3.1.1)
     thor (1.3.1)
     tilt (2.4.0)
     unicode-display_width (2.5.0)
@@ -171,6 +171,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -178,16 +179,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -209,10 +214,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   sinatra (~> 4)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_10.gemfile b/gemfiles/ruby_3.4_stripe_10.gemfile
index e4fa6dc770f..0e396c42f29 100644
--- a/gemfiles/ruby_3.4_stripe_10.gemfile
+++ b/gemfiles/ruby_3.4_stripe_10.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "~> 10"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_10.gemfile.lock b/gemfiles/ruby_3.4_stripe_10.gemfile.lock
index 91443bb3820..6d8c92d7724 100644
--- a/gemfiles/ruby_3.4_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_10.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stripe (10.15.0)
-    strscan (3.1.1)
     thor (1.3.2)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (~> 10)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_11.gemfile b/gemfiles/ruby_3.4_stripe_11.gemfile
index 713150745ec..72ecfeeb8d9 100644
--- a/gemfiles/ruby_3.4_stripe_11.gemfile
+++ b/gemfiles/ruby_3.4_stripe_11.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "~> 11"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_11.gemfile.lock b/gemfiles/ruby_3.4_stripe_11.gemfile.lock
index d14db81aa30..ab3e19d8770 100644
--- a/gemfiles/ruby_3.4_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_11.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stripe (11.7.0)
-    strscan (3.1.1)
     thor (1.3.2)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (~> 11)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_12.gemfile b/gemfiles/ruby_3.4_stripe_12.gemfile
index 282c7ea4683..890a23a9ecd 100644
--- a/gemfiles/ruby_3.4_stripe_12.gemfile
+++ b/gemfiles/ruby_3.4_stripe_12.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "~> 12"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_12.gemfile.lock b/gemfiles/ruby_3.4_stripe_12.gemfile.lock
index 80e1fbc8407..af5f346d0e5 100644
--- a/gemfiles/ruby_3.4_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_12.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stripe (12.6.0)
-    strscan (3.1.1)
     thor (1.3.2)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (~> 12)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_7.gemfile b/gemfiles/ruby_3.4_stripe_7.gemfile
index c195cb4cdd2..d014b78f788 100644
--- a/gemfiles/ruby_3.4_stripe_7.gemfile
+++ b/gemfiles/ruby_3.4_stripe_7.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "~> 7"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_7.gemfile.lock b/gemfiles/ruby_3.4_stripe_7.gemfile.lock
index 52fa4d1b269..498a406df8b 100644
--- a/gemfiles/ruby_3.4_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_7.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stripe (7.1.0)
-    strscan (3.1.1)
     thor (1.3.2)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (~> 7)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_8.gemfile b/gemfiles/ruby_3.4_stripe_8.gemfile
index 36feb105a63..73b90e9e55b 100644
--- a/gemfiles/ruby_3.4_stripe_8.gemfile
+++ b/gemfiles/ruby_3.4_stripe_8.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "~> 8"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_8.gemfile.lock b/gemfiles/ruby_3.4_stripe_8.gemfile.lock
index 122625dda9b..2f9e05b8b74 100644
--- a/gemfiles/ruby_3.4_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_8.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stripe (8.7.0)
-    strscan (3.1.1)
     thor (1.3.2)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (~> 8)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_9.gemfile b/gemfiles/ruby_3.4_stripe_9.gemfile
index 6d287a7cbf2..b769a2d9545 100644
--- a/gemfiles/ruby_3.4_stripe_9.gemfile
+++ b/gemfiles/ruby_3.4_stripe_9.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "~> 9"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_9.gemfile.lock b/gemfiles/ruby_3.4_stripe_9.gemfile.lock
index b924221ab5a..5f00de8d53d 100644
--- a/gemfiles/ruby_3.4_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_9.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.13.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -142,7 +144,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stripe (9.4.0)
-    strscan (3.1.1)
     thor (1.3.2)
     unicode-display_width (2.5.0)
     uri (0.13.1)
@@ -151,6 +152,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -158,16 +160,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -187,10 +193,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (~> 9)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_latest.gemfile b/gemfiles/ruby_3.4_stripe_latest.gemfile
index 95f6d68d416..5a66122e70c 100644
--- a/gemfiles/ruby_3.4_stripe_latest.gemfile
+++ b/gemfiles/ruby_3.4_stripe_latest.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_latest.gemfile.lock b/gemfiles/ruby_3.4_stripe_latest.gemfile.lock
index b85c504c9db..574b2295ca7 100644
--- a/gemfiles/ruby_3.4_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_latest.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -149,6 +151,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -156,16 +159,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -185,10 +192,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/gemfiles/ruby_3.4_stripe_min.gemfile b/gemfiles/ruby_3.4_stripe_min.gemfile
index b72bda19111..fa7227215dc 100644
--- a/gemfiles/ruby_3.4_stripe_min.gemfile
+++ b/gemfiles/ruby_3.4_stripe_min.gemfile
@@ -25,7 +25,7 @@ gem "simplecov-cobertura", "~> 2.1.0"
 gem "warning", "~> 1"
 gem "webmock", ">= 3.10.0"
 gem "rexml", ">= 3.2.7"
-gem "webrick", git: "https://github.com/ruby/webrick.git", ref: "0c600e169bd4ae267cb5eeb6197277c848323bbe"
+gem "webrick", ">= 1.8.2"
 gem "rubocop", "~> 1.50.0", require: false
 gem "rubocop-packaging", "~> 0.5.2", require: false
 gem "rubocop-performance", "~> 1.9", require: false
@@ -33,6 +33,11 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false
 gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "uri", "~> 0.13.1"
+gem "ffi", "~> 1.16.3", require: false
+gem "strscan", git: "https://github.com/ruby/strscan", ref: "041b15df4ccc067deabd85fd489b2c15961d0e2f"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
 gem "stripe", "= 5.15.0"
 
 group :check do
diff --git a/gemfiles/ruby_3.4_stripe_min.gemfile.lock b/gemfiles/ruby_3.4_stripe_min.gemfile.lock
index dd98c99bc23..544b955bdac 100644
--- a/gemfiles/ruby_3.4_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_min.gemfile.lock
@@ -9,11 +9,11 @@ GIT
       simplecov_json_formatter (~> 0.1)
 
 GIT
-  remote: https://github.com/ruby/webrick.git
-  revision: 0c600e169bd4ae267cb5eeb6197277c848323bbe
-  ref: 0c600e169bd4ae267cb5eeb6197277c848323bbe
+  remote: https://github.com/ruby/strscan
+  revision: 041b15df4ccc067deabd85fd489b2c15961d0e2f
+  ref: 041b15df4ccc067deabd85fd489b2c15961d0e2f
   specs:
-    webrick (1.8.1)
+    strscan (3.1.1)
 
 PATH
   remote: ..
@@ -34,6 +34,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
     benchmark-ips (2.14.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
@@ -52,7 +53,7 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.16.3)
     google-protobuf (3.25.5)
     hashdiff (1.1.1)
     json (2.7.2)
@@ -68,6 +69,7 @@ GEM
     method_source (1.1.0)
     mini_portile2 (2.8.7)
     msgpack (1.7.2)
+    mutex_m (0.2.0)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -149,6 +151,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.0)
 
 PLATFORMS
   aarch64-linux
@@ -156,16 +159,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 2.4.0)
+  base64
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
+  bigdecimal
   climate_control (~> 0.2.0)
   concurrent-ruby
   datadog!
   dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   extlz4 (~> 0.3, >= 0.3.3)
+  ffi (~> 1.16.3)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   json-schema (< 3)
   memory_profiler (~> 0.9)
+  mutex_m
   os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
@@ -185,10 +192,11 @@ DEPENDENCIES
   simplecov!
   simplecov-cobertura (~> 2.1.0)
   stripe (= 5.15.0)
+  strscan!
   uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
-  webrick!
+  webrick (>= 1.8.2)
 
 BUNDLED WITH
    2.3.26
diff --git a/ruby-3.4.gemfile b/ruby-3.4.gemfile
index 4dbf105905b..56740291aba 100644
--- a/ruby-3.4.gemfile
+++ b/ruby-3.4.gemfile
@@ -44,12 +44,8 @@ gem 'webmock', '>= 3.10.0'
 
 gem 'rexml', '>= 3.2.7' # https://www.ruby-lang.org/en/news/2024/05/16/dos-rexml-cve-2024-35176/
 
-if RUBY_VERSION.start_with?('3.4.')
-  # ruby 3.4 breaks stable webrick; we need this fix until a version later than 1.8.1 comes out
-  gem 'webrick', git: 'https://github.com/ruby/webrick.git', ref: '0c600e169bd4ae267cb5eeb6197277c848323bbe'
-elsif RUBY_VERSION >= '3.0.0' # No longer bundled by default since Ruby 3.0
-  gem 'webrick', '>= 1.7.0'
-end
+# No longer bundled by default since Ruby 3.0
+gem 'webrick', '>= 1.8.2' if RUBY_VERSION >= '3.0.0'
 
 if RUBY_VERSION >= '2.6.0'
   # 1.50 is the last version to support Ruby 2.6
@@ -92,3 +88,22 @@ group :dev do
 end
 
 gem 'uri', '~> 0.13.1' if RUBY_VERSION.start_with? '3'
+
+# `1.17.0` provides broken RBS type definitions
+# https://github.com/ffi/ffi/blob/master/CHANGELOG.md#1170rc1--2024-04-08
+#
+# TODO: Remove this once the issue is resolved: https://github.com/ffi/ffi/issues/1107
+gem 'ffi', '~> 1.16.3', require: false
+
+# Ruby 3.4 should be supported by strscan v3.1.1. However, the latest release of strscan is v3.1.0.
+# Pin strscan to the latest commit sha.
+#
+# TODO: Remove once v3.1.1 is released.
+gem 'strscan',
+  git: 'https://github.com/ruby/strscan',
+  ref: '041b15df4ccc067deabd85fd489b2c15961d0e2f'
+
+# No longer bundled by default since Ruby 3.4
+gem 'base64'
+gem 'bigdecimal'
+gem 'mutex_m'
diff --git a/spec/datadog/tracing/contrib/rails/support/deprecation.rb b/spec/datadog/tracing/contrib/rails/support/deprecation.rb
index 5724fa9a582..4daa1c91ba0 100644
--- a/spec/datadog/tracing/contrib/rails/support/deprecation.rb
+++ b/spec/datadog/tracing/contrib/rails/support/deprecation.rb
@@ -5,10 +5,27 @@ def raise_on_rails_deprecation!
   #      of which warnings are allowed, in case we need
   #      such feature.
   #
-  # In Rails 7.1 calling ActiveSupport::Deprecation.behavior= is deprecated
-  if defined?(Rails) && Rails.gem_version >= Gem::Version.new(7.1)
+  # In Rails 7.1 calling ActiveSupport::Deprecation.behavior= raises an exception.
+  # The new way of configuring deprecation is per framework, and each framework has
+  # its own deprecator object. If none of the frameworks have a deprecator object,
+  # we must be on an older version of Rails, in which case we can configure the
+  # deprecation behavior on ActiveSupport globally.
+  executed = false
+  if defined?(ActiveRecord) && ActiveRecord.respond_to?(:deprecator)
+    ActiveRecord.deprecator.behavior = :raise
+    executed = true
+  end
+  if defined?(ActiveModel) && ActiveModel.respond_to?(:deprecator)
+    ActiveModel.deprecator.behavior = :raise
+    executed = true
+  end
+  if defined?(ActionCable) && ActionCable.respond_to?(:deprecator)
+    ActionCable.deprecator.behavior = :raise
+    executed = true
+  end
+  if defined?(Rails) && Rails.respond_to?(:deprecator)
     Rails.deprecator.behavior = :raise
-  else
-    ActiveSupport::Deprecation.behavior = :raise
+    executed = true
   end
+  ActiveSupport::Deprecation.behavior = :raise unless executed
 end
diff --git a/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb b/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb
index 0ba135328f0..492ff7424cc 100644
--- a/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb
+++ b/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb
@@ -138,7 +138,7 @@
           expect(span.get_tag('span.kind')).to eq('client')
           expect(span.get_tag('db.system')).to eq('mysql')
           expect(span.get_tag('error.message'))
-            .to eq("1054: Unknown column 'INVALID' in 'field list'")
+            .to include("1054: Unknown column 'INVALID' in 'field list'")
         end
 
         it_behaves_like 'with sql comment propagation', span_op_name: 'trilogy.query', error: Trilogy::Error