diff --git a/Gemfile b/Gemfile
index 39853eaeebaea..f6cb76dc0bb07 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.3" # 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..dd900fbbda142 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,7 +170,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     counter_culture (2.8.0)
       activerecord (>= 4.2)
@@ -182,6 +182,7 @@ GEM
       puma (>= 3.8.0)
       railties (>= 5.2.0)
     dante (0.2.0)
+    date (3.3.3)
     ddtrace (0.52.0)
       ffi (~> 1.0)
       msgpack
@@ -239,7 +240,7 @@ GEM
       rubocop
       smart_properties
     errbase (0.2.1)
-    erubi (1.10.0)
+    erubi (1.11.0)
     et-orbi (1.2.4)
       tzinfo
     eventmachine (1.2.7)
@@ -314,7 +315,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 +367,7 @@ GEM
     httpclient (2.8.3)
     hypershield (0.2.2)
       activerecord (>= 5)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     image_processing (1.12.1)
@@ -414,13 +415,16 @@ 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.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
-    mail (2.7.1)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     memory_profiler (1.0.0)
@@ -430,9 +434,9 @@ GEM
     mime-types-data (3.2021.0704)
     mini_histogram (0.3.1)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
     modis (4.0.0)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
@@ -450,16 +454,25 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.4)
       http-2 (~> 0.11)
+    net-imap (0.3.3)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.12.3)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.12.3-arm64-darwin)
+    nokogiri (1.13.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.3-x86_64-darwin)
+    nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.3-x86_64-linux)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -529,8 +542,8 @@ GEM
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
     raabro (1.4.0)
-    racc (1.5.2)
-    rack (2.2.3)
+    racc (1.6.1)
+    rack (2.2.4)
     rack-attack (6.5.0)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
@@ -541,8 +554,8 @@ GEM
       rack
     rack-proxy (0.6.5)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rack-timeout (0.6.0)
     rails (6.1.4.1)
       actioncable (= 6.1.4.1)
@@ -562,10 +575,11 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.1)
-      loofah (~> 2.3)
-    rails-settings-cached (2.6.0)
-      rails (>= 5.0.0)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    rails-settings-cached (2.8.3)
+      activerecord (>= 5.0.0)
+      railties (>= 5.0.0)
     railties (6.1.4.1)
       actionpack (= 6.1.4.1)
       activesupport (= 6.1.4.1)
@@ -745,9 +759,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,10 +779,11 @@ 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)
+    timeout (0.3.1)
     twitter (7.0.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -780,7 +795,7 @@ GEM
       multipart-post (~> 2.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -838,7 +853,7 @@ GEM
       yard (>= 0.8.3)
     yard-activesupport-concern (0.0.1)
       yard (>= 0.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.6)
     zonebie (0.6.1)
 
 PLATFORMS
@@ -941,7 +956,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.3)
   ransack (~> 2.4)
   recaptcha (~> 5.8)
   redcarpet (~> 3.5)
diff --git a/vendor/cache/concurrent-ruby-1.1.10.gem b/vendor/cache/concurrent-ruby-1.1.10.gem
new file mode 100644
index 0000000000000..c796701bee261
Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.1.10.gem differ
diff --git a/vendor/cache/concurrent-ruby-1.1.9.gem b/vendor/cache/concurrent-ruby-1.1.9.gem
deleted file mode 100644
index 9ed64f26c74f4..0000000000000
Binary files a/vendor/cache/concurrent-ruby-1.1.9.gem and /dev/null differ
diff --git a/vendor/cache/date-3.3.3.gem b/vendor/cache/date-3.3.3.gem
new file mode 100644
index 0000000000000..d4bc123492040
Binary files /dev/null and b/vendor/cache/date-3.3.3.gem differ
diff --git a/vendor/cache/erubi-1.10.0.gem b/vendor/cache/erubi-1.10.0.gem
deleted file mode 100644
index 31894cf32afc1..0000000000000
Binary files a/vendor/cache/erubi-1.10.0.gem and /dev/null differ
diff --git a/vendor/cache/erubi-1.11.0.gem b/vendor/cache/erubi-1.11.0.gem
new file mode 100644
index 0000000000000..4caea75922138
Binary files /dev/null and b/vendor/cache/erubi-1.11.0.gem differ
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.12.0.gem b/vendor/cache/i18n-1.12.0.gem
new file mode 100644
index 0000000000000..c64c068e63c86
Binary files /dev/null and b/vendor/cache/i18n-1.12.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/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.19.1.gem b/vendor/cache/loofah-2.19.1.gem
new file mode 100644
index 0000000000000..9ac4d59fcb891
Binary files /dev/null and b/vendor/cache/loofah-2.19.1.gem differ
diff --git a/vendor/cache/mail-2.7.1.gem b/vendor/cache/mail-2.7.1.gem
deleted file mode 100644
index 066ef0f0fc6d9..0000000000000
Binary files a/vendor/cache/mail-2.7.1.gem and /dev/null differ
diff --git a/vendor/cache/mail-2.8.0.gem b/vendor/cache/mail-2.8.0.gem
new file mode 100644
index 0000000000000..f831b82f6e199
Binary files /dev/null and b/vendor/cache/mail-2.8.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/mini_portile2-2.6.1.gem b/vendor/cache/mini_portile2-2.6.1.gem
deleted file mode 100644
index 3e5b08d4a8003..0000000000000
Binary files a/vendor/cache/mini_portile2-2.6.1.gem and /dev/null differ
diff --git a/vendor/cache/mini_portile2-2.8.0.gem b/vendor/cache/mini_portile2-2.8.0.gem
new file mode 100644
index 0000000000000..41f04a4409c85
Binary files /dev/null and b/vendor/cache/mini_portile2-2.8.0.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.16.3.gem b/vendor/cache/minitest-5.16.3.gem
new file mode 100644
index 0000000000000..ebdb92e36c281
Binary files /dev/null and b/vendor/cache/minitest-5.16.3.gem differ
diff --git a/vendor/cache/net-imap-0.3.3.gem b/vendor/cache/net-imap-0.3.3.gem
new file mode 100644
index 0000000000000..94906683fdac3
Binary files /dev/null and b/vendor/cache/net-imap-0.3.3.gem differ
diff --git a/vendor/cache/net-pop-0.1.2.gem b/vendor/cache/net-pop-0.1.2.gem
new file mode 100644
index 0000000000000..98bcdb7e434c4
Binary files /dev/null and b/vendor/cache/net-pop-0.1.2.gem differ
diff --git a/vendor/cache/net-protocol-0.2.1.gem b/vendor/cache/net-protocol-0.2.1.gem
new file mode 100644
index 0000000000000..60b8794b07d90
Binary files /dev/null and b/vendor/cache/net-protocol-0.2.1.gem differ
diff --git a/vendor/cache/net-smtp-0.3.3.gem b/vendor/cache/net-smtp-0.3.3.gem
new file mode 100644
index 0000000000000..09fd408d8122b
Binary files /dev/null and b/vendor/cache/net-smtp-0.3.3.gem differ
diff --git a/vendor/cache/nokogiri-1.12.3-arm64-darwin.gem b/vendor/cache/nokogiri-1.12.3-arm64-darwin.gem
deleted file mode 100644
index 02162e42b94d6..0000000000000
Binary files a/vendor/cache/nokogiri-1.12.3-arm64-darwin.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.12.3-x86_64-darwin.gem b/vendor/cache/nokogiri-1.12.3-x86_64-darwin.gem
deleted file mode 100644
index e6f5355ccfb7e..0000000000000
Binary files a/vendor/cache/nokogiri-1.12.3-x86_64-darwin.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.12.3-x86_64-linux.gem b/vendor/cache/nokogiri-1.12.3-x86_64-linux.gem
deleted file mode 100644
index 583332467f9ed..0000000000000
Binary files a/vendor/cache/nokogiri-1.12.3-x86_64-linux.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.12.3.gem b/vendor/cache/nokogiri-1.12.3.gem
deleted file mode 100644
index de621fa50e797..0000000000000
Binary files a/vendor/cache/nokogiri-1.12.3.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.13.10-arm64-darwin.gem b/vendor/cache/nokogiri-1.13.10-arm64-darwin.gem
new file mode 100644
index 0000000000000..1c1d03363e42c
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-arm64-darwin.gem differ
diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem b/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem
new file mode 100644
index 0000000000000..3670382e0d17b
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem differ
diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem
new file mode 100644
index 0000000000000..8a7f2b6ad0e5d
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem differ
diff --git a/vendor/cache/nokogiri-1.13.10.gem b/vendor/cache/nokogiri-1.13.10.gem
new file mode 100644
index 0000000000000..25012e35bb033
Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10.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.1.gem b/vendor/cache/racc-1.6.1.gem
new file mode 100644
index 0000000000000..a59e84b226c17
Binary files /dev/null and b/vendor/cache/racc-1.6.1.gem differ
diff --git a/vendor/cache/rack-2.2.3.gem b/vendor/cache/rack-2.2.3.gem
deleted file mode 100644
index 19fa2e9ffc9cb..0000000000000
Binary files a/vendor/cache/rack-2.2.3.gem and /dev/null differ
diff --git a/vendor/cache/rack-2.2.4.gem b/vendor/cache/rack-2.2.4.gem
new file mode 100644
index 0000000000000..cff677e7af08f
Binary files /dev/null and b/vendor/cache/rack-2.2.4.gem differ
diff --git a/vendor/cache/rack-test-1.1.0.gem b/vendor/cache/rack-test-1.1.0.gem
deleted file mode 100644
index 3fb2d3a8f115b..0000000000000
Binary files a/vendor/cache/rack-test-1.1.0.gem and /dev/null differ
diff --git a/vendor/cache/rack-test-2.0.2.gem b/vendor/cache/rack-test-2.0.2.gem
new file mode 100644
index 0000000000000..b57f15d8ddbf6
Binary files /dev/null and b/vendor/cache/rack-test-2.0.2.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.4.gem b/vendor/cache/rails-html-sanitizer-1.4.4.gem
new file mode 100644
index 0000000000000..22bb956a5640e
Binary files /dev/null and b/vendor/cache/rails-html-sanitizer-1.4.4.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.3.gem b/vendor/cache/rails-settings-cached-2.8.3.gem
new file mode 100644
index 0000000000000..e766b55d322e5
Binary files /dev/null and b/vendor/cache/rails-settings-cached-2.8.3.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/timeout-0.3.1.gem b/vendor/cache/timeout-0.3.1.gem
new file mode 100644
index 0000000000000..95369ebe089d0
Binary files /dev/null and b/vendor/cache/timeout-0.3.1.gem differ
diff --git a/vendor/cache/tzinfo-2.0.4.gem b/vendor/cache/tzinfo-2.0.4.gem
deleted file mode 100644
index a3f982055a81b..0000000000000
Binary files a/vendor/cache/tzinfo-2.0.4.gem and /dev/null differ
diff --git a/vendor/cache/tzinfo-2.0.5.gem b/vendor/cache/tzinfo-2.0.5.gem
new file mode 100644
index 0000000000000..1b28f07d2762a
Binary files /dev/null and b/vendor/cache/tzinfo-2.0.5.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.6.6.gem b/vendor/cache/zeitwerk-2.6.6.gem
new file mode 100644
index 0000000000000..b31dd18853da9
Binary files /dev/null and b/vendor/cache/zeitwerk-2.6.6.gem differ