diff --git a/Gemfile b/Gemfile
index 39853eaeebaea..ad18c4fa22a6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,7 +75,7 @@ gem "rack-cors", "~> 1.1" # Middleware that will make Rack-based apps CORS compa
 gem "rack-timeout", "~> 0.6" # Rack middleware which aborts requests that have been running for longer than a specified timeout
 gem "rails", "~> 6.1.4" # Ruby on Rails
 # Pinned since we have a monkey-patch against this version
-gem "rails-settings-cached", "2.6.0" # Settings plugin for Rails that makes managing a table of global key, value pairs easy.
+gem "rails-settings-cached", "2.8.2" # Settings plugin for Rails that makes managing a table of global key, value pairs easy.
 gem "ransack", "~> 2.4" # Searching and sorting
 gem "recaptcha", "~> 5.8", require: "recaptcha/rails" # Helpers for the reCAPTCHA API
 gem "redcarpet", "~> 3.5" # A fast, safe and extensible Markdown to (X)HTML parser
diff --git a/Gemfile.lock b/Gemfile.lock
index 56a94a1d86a2e..e6486c7b6068a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,7 +314,7 @@ GEM
     gibbon (3.4.0)
       faraday (>= 0.16.0)
       multi_json (>= 1.11.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
@@ -366,7 +366,7 @@ GEM
     httpclient (2.8.3)
     hypershield (0.2.2)
       activerecord (>= 5)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     image_processing (1.12.1)
@@ -414,13 +414,13 @@ GEM
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     memory_profiler (1.0.0)
@@ -430,9 +430,9 @@ GEM
     mime-types-data (3.2021.0704)
     mini_histogram (0.3.1)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     modis (4.0.0)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
@@ -529,7 +529,7 @@ GEM
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
     raabro (1.4.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-attack (6.5.0)
       rack (>= 1.0, < 3)
@@ -562,9 +562,9 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.1)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rails-settings-cached (2.6.0)
+    rails-settings-cached (2.8.2)
       rails (>= 5.0.0)
     railties (6.1.4.1)
       actionpack (= 6.1.4.1)
@@ -745,9 +745,9 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.7)
     staccato (0.5.3)
@@ -765,7 +765,7 @@ GEM
     strong_migrations (0.7.8)
       activerecord (>= 5)
     test-prof (1.0.6)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     timecop (0.9.4)
@@ -838,7 +838,7 @@ GEM
       yard (>= 0.8.3)
     yard-activesupport-concern (0.0.1)
       yard (>= 0.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.3)
     zonebie (0.6.1)
 
 PLATFORMS
@@ -941,7 +941,7 @@ DEPENDENCIES
   rack-host-redirect (~> 1.3)
   rack-timeout (~> 0.6)
   rails (~> 6.1.4)
-  rails-settings-cached (= 2.6.0)
+  rails-settings-cached (= 2.8.2)
   ransack (~> 2.4)
   recaptcha (~> 5.8)
   redcarpet (~> 3.5)
diff --git a/vendor/cache/globalid-0.5.2.gem b/vendor/cache/globalid-0.5.2.gem
deleted file mode 100644
index a9d2fb00b91c6..0000000000000
Binary files a/vendor/cache/globalid-0.5.2.gem and /dev/null differ
diff --git a/vendor/cache/globalid-1.0.0.gem b/vendor/cache/globalid-1.0.0.gem
new file mode 100644
index 0000000000000..646070758214b
Binary files /dev/null and b/vendor/cache/globalid-1.0.0.gem differ
diff --git a/vendor/cache/i18n-1.8.10.gem b/vendor/cache/i18n-1.8.10.gem
deleted file mode 100644
index 7dd1339024227..0000000000000
Binary files a/vendor/cache/i18n-1.8.10.gem and /dev/null differ
diff --git a/vendor/cache/i18n-1.8.11.gem b/vendor/cache/i18n-1.8.11.gem
new file mode 100644
index 0000000000000..b6ecc160098fd
Binary files /dev/null and b/vendor/cache/i18n-1.8.11.gem differ
diff --git a/vendor/cache/loofah-2.12.0.gem b/vendor/cache/loofah-2.12.0.gem
deleted file mode 100644
index edf8cf6b08235..0000000000000
Binary files a/vendor/cache/loofah-2.12.0.gem and /dev/null differ
diff --git a/vendor/cache/loofah-2.13.0.gem b/vendor/cache/loofah-2.13.0.gem
new file mode 100644
index 0000000000000..ecfec24366445
Binary files /dev/null and b/vendor/cache/loofah-2.13.0.gem differ
diff --git a/vendor/cache/marcel-1.0.1.gem b/vendor/cache/marcel-1.0.1.gem
deleted file mode 100644
index 0ad605c80a14a..0000000000000
Binary files a/vendor/cache/marcel-1.0.1.gem and /dev/null differ
diff --git a/vendor/cache/marcel-1.0.2.gem b/vendor/cache/marcel-1.0.2.gem
new file mode 100644
index 0000000000000..acb69eb32f847
Binary files /dev/null and b/vendor/cache/marcel-1.0.2.gem differ
diff --git a/vendor/cache/mini_mime-1.1.0.gem b/vendor/cache/mini_mime-1.1.0.gem
deleted file mode 100644
index 26d0f62927e35..0000000000000
Binary files a/vendor/cache/mini_mime-1.1.0.gem and /dev/null differ
diff --git a/vendor/cache/mini_mime-1.1.2.gem b/vendor/cache/mini_mime-1.1.2.gem
new file mode 100644
index 0000000000000..6e7946503c5a8
Binary files /dev/null and b/vendor/cache/mini_mime-1.1.2.gem differ
diff --git a/vendor/cache/minitest-5.14.4.gem b/vendor/cache/minitest-5.14.4.gem
deleted file mode 100644
index 6a7369480468d..0000000000000
Binary files a/vendor/cache/minitest-5.14.4.gem and /dev/null differ
diff --git a/vendor/cache/minitest-5.15.0.gem b/vendor/cache/minitest-5.15.0.gem
new file mode 100644
index 0000000000000..bb3c2475eea23
Binary files /dev/null and b/vendor/cache/minitest-5.15.0.gem differ
diff --git a/vendor/cache/racc-1.5.2.gem b/vendor/cache/racc-1.5.2.gem
deleted file mode 100644
index 39f03fa79c387..0000000000000
Binary files a/vendor/cache/racc-1.5.2.gem and /dev/null differ
diff --git a/vendor/cache/racc-1.6.0.gem b/vendor/cache/racc-1.6.0.gem
new file mode 100644
index 0000000000000..7015819f1d73a
Binary files /dev/null and b/vendor/cache/racc-1.6.0.gem differ
diff --git a/vendor/cache/rails-html-sanitizer-1.4.1.gem b/vendor/cache/rails-html-sanitizer-1.4.1.gem
deleted file mode 100644
index 9ff67a624c16d..0000000000000
Binary files a/vendor/cache/rails-html-sanitizer-1.4.1.gem and /dev/null differ
diff --git a/vendor/cache/rails-html-sanitizer-1.4.2.gem b/vendor/cache/rails-html-sanitizer-1.4.2.gem
new file mode 100644
index 0000000000000..aab9fa6cfb716
Binary files /dev/null and b/vendor/cache/rails-html-sanitizer-1.4.2.gem differ
diff --git a/vendor/cache/rails-settings-cached-2.6.0.gem b/vendor/cache/rails-settings-cached-2.6.0.gem
deleted file mode 100644
index c5d6eb45a7fc4..0000000000000
Binary files a/vendor/cache/rails-settings-cached-2.6.0.gem and /dev/null differ
diff --git a/vendor/cache/rails-settings-cached-2.8.2.gem b/vendor/cache/rails-settings-cached-2.8.2.gem
new file mode 100644
index 0000000000000..8af2da9753ccc
Binary files /dev/null and b/vendor/cache/rails-settings-cached-2.8.2.gem differ
diff --git a/vendor/cache/sprockets-rails-3.2.2.gem b/vendor/cache/sprockets-rails-3.2.2.gem
deleted file mode 100644
index 8d2c00be60c29..0000000000000
Binary files a/vendor/cache/sprockets-rails-3.2.2.gem and /dev/null differ
diff --git a/vendor/cache/sprockets-rails-3.4.2.gem b/vendor/cache/sprockets-rails-3.4.2.gem
new file mode 100644
index 0000000000000..64591bff02715
Binary files /dev/null and b/vendor/cache/sprockets-rails-3.4.2.gem differ
diff --git a/vendor/cache/thor-1.1.0.gem b/vendor/cache/thor-1.1.0.gem
deleted file mode 100644
index 2677414cc6185..0000000000000
Binary files a/vendor/cache/thor-1.1.0.gem and /dev/null differ
diff --git a/vendor/cache/thor-1.2.1.gem b/vendor/cache/thor-1.2.1.gem
new file mode 100644
index 0000000000000..d7e14e1f945d3
Binary files /dev/null and b/vendor/cache/thor-1.2.1.gem differ
diff --git a/vendor/cache/zeitwerk-2.4.2.gem b/vendor/cache/zeitwerk-2.4.2.gem
deleted file mode 100644
index 8054e9466d232..0000000000000
Binary files a/vendor/cache/zeitwerk-2.4.2.gem and /dev/null differ
diff --git a/vendor/cache/zeitwerk-2.5.3.gem b/vendor/cache/zeitwerk-2.5.3.gem
new file mode 100644
index 0000000000000..12113cdece097
Binary files /dev/null and b/vendor/cache/zeitwerk-2.5.3.gem differ