diff --git a/.dockerignore b/.dockerignore
index e3cd043e9..fb4e9b361 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,9 +6,12 @@
 # Ignore bundler config.
 /.bundle
 
-# Ignore all environment files (except templates).
+# Ignore all environment files
 /.env*
-!/.env*.erb
+
+# Ignore Kamal files.
+/config/deploy*.yml
+/.kamal
 
 # Ignore all default key files.
 /config/master.key
diff --git a/.gitignore b/.gitignore
index f856c4e89..e7cd399ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,8 @@
 # Ignore bundler config
 /.bundle
 
-# Ignore all environment files (except templates).
+# Ignore all environment files
 /.env*
-!/.env*.erb
 
 # Ignore all logfiles and tempfiles.
 /log/*
diff --git a/.rubocop.yml b/.rubocop.yml
index 0d729d038..dbcb46b2c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -12,8 +12,8 @@ require:
 Rails:
   Enabled: true
 AllCops:
-  TargetRubyVersion: 3.2.5
-  TargetRailsVersion: 7.1
+  TargetRubyVersion: 3.4
+  TargetRailsVersion: 8.0
 
 Style/StringLiterals:
   EnforcedStyle: single_quotes
diff --git a/.ruby-version b/.ruby-version
index 5ae69bd5f..7bcbb3808 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.5
+3.4.9
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c88f2f20..ac7ab1bba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### 1.22.0
+
+**Rails 7.2 Upgrade**
+The primary goal of this release is to upgrade the Rails version without causing
+any breaking changes to functionality.
+
+* Upgrades Rails 7.1.3.4 to 8.0.5
+* Upgrades Ruby 3.2.5 to 3.4.9
+* Some dependency updates/changes allowed or required by the above:
+  * Upgraded `sprockets` from 3.7.2 to 4.0.3
+  * Upgraded `papertrail` from 15.1.0 to 17.0.0
+  * Upgraded `acts-as-taggable-on` from 10.0.0 to 12.0.0
+
 ### 1.21.2
 
 **Species+**
diff --git a/Dockerfile b/Dockerfile
index 5b18e7dcc..5ce6e24a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # or SUS-ORS project.
 
 # Dockerfile
-FROM ruby:3.2.5
+FROM ruby:3.4.9
 
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
@@ -21,11 +21,13 @@ RUN apt-get update && apt-get install -y --force-yes \
 RUN mkdir /SAPI
 WORKDIR /SAPI
 
-#
-# Don't need to do these, as we have done this with Docker bindings
-#   COPY Gemfile /SAPI/Gemfile
-#   COPY Gemfile.lock /SAPI/Gemfile.lock
-RUN gem install bundler -v 2.5.17
+COPY Gemfile.lock /SAPI/Gemfile.lock
+
+RUN grep -A1 '^BUNDLED WITH$' Gemfile.lock | tail -n1 | tr -d ' ' \
+  | xargs -I _BUNDLER_VERSION_ gem install bundler -v _BUNDLER_VERSION_
+
+# Don't this any more, as we get it with Docker bindings
+RUN rm /SAPI/Gemfile.lock
 
 ##
 # This happens in the entrypoint
diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index 377c091fc..dab0ef354 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -1,5 +1,5 @@
 # Dockerfile
-FROM ruby:3.2.5
+FROM ruby:3.4.9
 
 ENV DEBIAN_FRONTEND=noninteractive
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
@@ -20,7 +20,7 @@ WORKDIR /SAPI
 # https://stackoverflow.com/questions/43612927/how-to-correctly-install-rvm-in-docker
 RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN curl -sSL https://get.rvm.io | bash -s
-RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 3.2.5"
+RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 3.4.9"
 # RVM installed in multi-user mode. However cap assume rvm is installed in single user mode.
 # Create a soft link to fake it.
 RUN mkdir -p ~/.rvm/bin && ln -s /usr/local/rvm/bin/rvm ~/.rvm/bin/rvm
@@ -29,9 +29,11 @@ COPY Gemfile /SAPI/Gemfile
 COPY Gemfile.lock /SAPI/Gemfile.lock
 
 ENV BUNDLE_SILENCE_ROOT_WARNING=1
+
 RUN /bin/bash -c "source /etc/profile.d/rvm.sh \
-  && gem install bundler:2.5.17 \
-  && bundle"
+  && grep -A1 '^BUNDLED WITH$' Gemfile.lock | tail -n1 | tr -d ' ' \
+  | xargs -I _BUNDLER_VERSION_ gem install bundler -v _BUNDLER_VERSION_ \
+  && bundle install"
 
 ENTRYPOINT ["/bin/bash", "-l"]
 
diff --git a/Gemfile b/Gemfile
index 100a8b7da..38bdd2378 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
-ruby '3.2.5'
+ruby '3.4.9'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '7.1.3.4'
+gem 'rails', '8.0.5'
 
 # Configure Cross-Origin resource sharing
 gem 'rack-cors'
@@ -14,15 +14,10 @@ gem 'rack-cors'
 gem 'puma', '~> 5.0'
 
 # Use SCSS for stylesheets
-# TODO: Can't upgrade sass-rails to 6.0, it raise the following error when running `RAILS_ENV=staging rake assets:precompile`.
-# SassC::SyntaxError: Error: Invalid CSS after "...in-bottom:-3px;": expected "}", was ".margin-bottom:-3px"
-#         on line 3712:5063 of stdin
-# >> ction=135,Strength=3)";_margin-bottom:-3px;.margin-bottom:-3px;}/*!Add round
-# gem 'sass-rails', '>= 6'
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails', '~> 6'
 
 # https://stackoverflow.com/questions/55213868/rails-6-how-to-disable-webpack-and-use-sprockets-instead
-gem 'sprockets', '3.7.2'
+gem 'sprockets', '~> 4'
 gem 'sprockets-rails', require: 'sprockets/railtie'
 
 # Use Terser as compressor for JavaScript assets
@@ -34,10 +29,10 @@ gem 'coffee-rails', '~> 5.0'
 # gem 'mini_racer', platforms: :ruby
 
 gem 'active_model_serializers', '0.8.4' # Deprecated
-gem "active_storage_validations", "~> 2.0"
+gem 'active_storage_validations', '~> 2.0'
 
 # Use redis for caching
-gem "redis", "~> 4.8"
+gem 'redis', '~> 4.8'
 
 # Use PostgreSQL database
 gem 'pg', '~> 1.5', '>= 1.5.4'
@@ -53,6 +48,7 @@ gem 'devise', '~> 4.9', '>= 4.9.3'
 gem 'cancancan', '~> 3.5'
 gem 'ahoy_matey', '~> 5.0', '>= 5.0.2'
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
+gem 'csv', '~> 3.3.5' # no longer a default gem from Ruby 3.4.0 onwards
 
 gem 'wicked', '2.0.0'
 
@@ -70,7 +66,7 @@ gem 'httparty', '~> 0.21.0'
 
 gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
 
-gem 'acts-as-taggable-on', '~> 10.0' # TODO: refuses to install against Rails 7.2
+gem 'acts-as-taggable-on', '~> 12.0'
 gem 'carrierwave', '~> 3.0', '>= 3.0.5'
 
 # PDF
@@ -98,17 +94,22 @@ gem 'bootsnap', '>= 1.4.4', require: false
 # To use Jbuilder templates for JSON
 # gem 'jbuilder', '~> 2.7'
 
+gem 'erb', '~> 6.0.2'
+
 group :development do
+  ##
   # Adds comments at the top of models describing table column
   # (replaces annotate)
-  gem 'annotaterb', '~> 4.10.2'
+  gem 'annotaterb', '~> 4.22.0'
 
+  ##
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '>= 4.1.0'
+  gem 'web-console'
+
   # Display performance information such as SQL time and flame graphs for each request in your browser.
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
-  gem 'rack-mini-profiler', '~> 2.0'
-  gem 'listen', '~> 3.3'
+  gem 'rack-mini-profiler', '~> 4.0.1'
+  gem 'listen', '~> 3.10.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 
@@ -145,11 +146,15 @@ group :development do
   gem 'bcrypt_pbkdf', '1.1.0'
   gem 'ed25519', '1.2.4'
 
-  # @TODO: bring back when ruby updated to > 2.6 # gem 'net-ssh', '7.0.0.beta1' # openssl 3.0 compatibility @see https://stackoverflow.com/q/72068406/1090438
+  ##
+  # Static analysis for security vulnerabilities [https://brakemanscanner.org/]
+  gem 'brakeman', require: false
+
+  gem 'net-ssh', '7.3.2'
 end
 
 group :test, :development do
-  gem 'rspec-rails', '~> 6.1', '>= 6.1.1'
+  gem 'rspec-rails', '~> 7.1'
   gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
   gem 'json_spec', '~> 1.1', '>= 1.1.5'
   gem 'database_cleaner', '~> 2.0', '>= 2.0.2'
@@ -161,12 +166,12 @@ end
 group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 3.26'
-  gem 'selenium-webdriver', '>= 4.0.0.rc1'
+  gem 'selenium-webdriver', '~> 4.41'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 
   gem 'rails-controller-testing'
-  gem 'factory_bot_rails', '5.2.0'
+  gem 'factory_bot_rails', '~> 6.5.1'
   gem 'simplecov', '~> 0.22.0', require: false
   gem 'coveralls_reborn', '~> 0.28.0', require: false
 end
@@ -174,7 +179,7 @@ end
 gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018
 
 gem 'request_store', '~> 1.5', '>= 1.5.1'
-gem 'paper_trail', '15.1.0'
+gem 'paper_trail', '~> 17.0.0'
 
 gem 'dotenv-rails', '2.0.1'
 
@@ -228,6 +233,4 @@ gem 'handlebars-source', '1.0.12' # TODO: just a wrapwrapper. Any update will ch
 #
 # It might be possible to fix this if we had an nginx version which supported
 # the config: `passenger_preload_bundler on;`
-gem 'base64', '0.1.1'
-
-
+gem 'base64', '0.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d9acef088..d7ea6c3bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,51 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actioncable (8.0.5)
+      actionpack (= 8.0.5)
+      activesupport (= 8.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (8.0.5)
+      actionpack (= 8.0.5)
+      activejob (= 8.0.5)
+      activerecord (= 8.0.5)
+      activestorage (= 8.0.5)
+      activesupport (= 8.0.5)
+      mail (>= 2.8.0)
+    actionmailer (8.0.5)
+      actionpack (= 8.0.5)
+      actionview (= 8.0.5)
+      activejob (= 8.0.5)
+      activesupport (= 8.0.5)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (8.0.5)
+      actionview (= 8.0.5)
+      activesupport (= 8.0.5)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actiontext (8.0.5)
+      actionpack (= 8.0.5)
+      activerecord (= 8.0.5)
+      activestorage (= 8.0.5)
+      activesupport (= 8.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (8.0.5)
+      activesupport (= 8.0.5)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -55,67 +49,77 @@ GEM
       ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (2.0.3)
+    active_storage_validations (2.0.4)
       activejob (>= 6.1.4)
       activemodel (>= 6.1.4)
       activestorage (>= 6.1.4)
       activesupport (>= 6.1.4)
       marcel (>= 1.0.3)
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (8.0.5)
+      activesupport (= 8.0.5)
       globalid (>= 0.3.6)
-    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)
+    activemodel (8.0.5)
+      activesupport (= 8.0.5)
+    activerecord (8.0.5)
+      activemodel (= 8.0.5)
+      activesupport (= 8.0.5)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activestorage (8.0.5)
+      actionpack (= 8.0.5)
+      activejob (= 8.0.5)
+      activerecord (= 8.0.5)
+      activesupport (= 8.0.5)
       marcel (~> 1.0)
-    activesupport (7.1.3.4)
+    activesupport (8.0.5)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    acts-as-taggable-on (10.0.0)
-      activerecord (>= 6.1, < 7.2)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    acts-as-taggable-on (12.0.0)
+      activerecord (>= 7.1, < 8.1)
+      zeitwerk (>= 2.4, < 3.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     afm (0.2.2)
-    ahoy_matey (5.1.0)
-      activesupport (>= 6.1)
+    ahoy_matey (5.5.0)
+      activesupport (>= 7.2)
+      cgi
       device_detector (>= 1)
       safely_block (>= 0.4)
-    airbrussh (1.5.2)
+    airbrussh (1.6.1)
       sshkit (>= 1.6.1, != 1.7.0)
-    annotaterb (4.10.2)
+    annotaterb (4.22.0)
+      activerecord (>= 6.0.0)
+      activesupport (>= 6.0.0)
     appsignal (3.13.1)
       rack
-    ast (2.4.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.961.0)
-    aws-sdk-core (3.201.3)
+    ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1237.0)
+    aws-sdk-core (3.244.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+      logger
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.157.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.219.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -124,20 +128,24 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
-    base64 (0.1.1)
-    bcrypt (3.1.20)
+    base64 (0.2.0)
+    bcrypt (3.1.22)
     bcrypt_pbkdf (1.1.0)
-    bigdecimal (3.1.8)
+    benchmark (0.5.0)
+    bigdecimal (4.1.1)
     bindex (0.8.1)
-    bootsnap (1.18.3)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
+    brakeman (8.0.4)
+      racc
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
     builder (3.3.0)
-    byebug (11.1.3)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
     cancancan (3.6.1)
     capistrano (3.18.0)
       airbrussh (>= 1.0.0)
@@ -171,14 +179,15 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (3.0.7)
+    carrierwave (3.1.2)
       activemodel (>= 6.0.0)
       activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.0.7)
+    cgi (0.5.1)
+    chartkick (5.2.1)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     coffee-rails (5.0.0)
@@ -188,21 +197,22 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     coveralls_reborn (0.28.0)
       simplecov (~> 0.22.0)
       term-ansicolor (~> 1.7)
       thor (~> 1.2)
       tins (~> 1.32)
     crass (1.0.6)
-    database_cleaner (2.0.2)
+    csv (3.3.5)
+    database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.5.1)
     device_detector (1.1.3)
     devise (4.9.4)
       bcrypt (~> 3.0)
@@ -210,12 +220,12 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
     dotenv (2.0.1)
     dotenv-rails (2.0.1)
       dotenv (= 2.0.1)
-    drb (2.2.1)
+    drb (2.2.3)
     ed25519 (1.2.4)
     ember-cli-assets (0.0.37)
     ember-data-source (1.13.0)
@@ -238,59 +248,62 @@ GEM
       railties (>= 4.2)
     ember-source (1.8.0)
       handlebars-source (~> 1.0)
-    erubi (1.13.0)
-    et-orbi (1.2.11)
+    erb (6.0.2)
+    erubi (1.13.1)
+    et-orbi (1.4.0)
       tzinfo
-    execjs (2.9.1)
-    factory_bot (5.2.0)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.2.0)
-      factory_bot (~> 5.2.0)
-      railties (>= 4.2.0)
-    ffi (1.17.0)
+    execjs (2.10.1)
+    factory_bot (6.5.6)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.1)
+      factory_bot (~> 6.5)
+      railties (>= 6.1.0)
+    ffi (1.17.4-x86_64-linux-gnu)
     file_exists (0.2.0)
-    fugit (1.11.0)
-      et-orbi (~> 1, >= 1.2.11)
+    fugit (1.12.1)
+      et-orbi (~> 1.4)
       raabro (~> 1.4)
     geoip (1.3.5)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
-    gon (6.4.0)
+    gon (6.6.0)
       actionpack (>= 3.0.20)
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    groupdate (6.4.0)
-      activesupport (>= 6.1)
+    groupdate (6.8.0)
+      activesupport (>= 7.2)
     handlebars-source (1.0.12)
-    has_scope (0.8.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    has_scope (0.9.0)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
     hashery (2.1.2)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.5)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inherited_resources (1.14.0)
       actionpack (>= 6.0)
       has_scope (>= 0.6)
       railties (>= 6.0)
       responders (>= 2)
-    io-console (0.7.2)
-    irb (1.14.0)
+    io-console (0.8.2)
+    irb (1.17.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jslint_on_rails (1.1.1)
-    json (2.7.2)
+    json (2.19.3)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
@@ -306,65 +319,74 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (3.9.0)
+    lint_roller (1.1.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
-    loofah (2.24.0)
+    logger (1.7.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     marcel (1.0.4)
-    matrix (0.4.2)
-    mini_magick (4.13.2)
+    matrix (0.4.3)
+    mini_magick (5.3.1)
+      logger
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.24.1)
-    mobility (1.2.9)
+    mini_portile2 (2.8.9)
+    minitest (6.0.3)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    mize (0.6.1)
+    mobility (1.3.2)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    msgpack (1.7.2)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    mutex_m (0.2.0)
+    msgpack (1.8.0)
+    multi_json (1.19.1)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
     nested-hstore (0.1.2)
       activerecord
       activesupport
     nested_form (0.3.2)
-    net-imap (0.4.20)
+    net-imap (0.6.3)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-scp (4.0.0)
+    net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    net-ssh (7.2.3)
-    nio4r (2.7.3)
-    nokogiri (1.18.8)
+    net-ssh (7.3.2)
+    nio4r (2.7.5)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
-    oj (3.16.4)
+    oj (3.16.16)
       bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     orm_adapter (0.5.0)
-    paper_trail (15.1.0)
-      activerecord (>= 6.1)
+    ostruct (0.6.3)
+    paper_trail (17.0.0)
+      activerecord (>= 7.1)
       request_store (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (2.0.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     pdf-reader (1.4.1)
@@ -374,69 +396,75 @@ GEM
       ruby-rc4
       ttfunk
     pdfkit (0.8.7.3)
-    pg (1.5.7)
+    pg (1.6.3-x86_64-linux)
     pg_array_parser (0.0.9)
-    pg_search (2.3.6)
-      activerecord (>= 5.2)
-      activesupport (>= 5.2)
+    pg_search (2.3.7)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
+    pp (0.6.3)
+      prettyprint
     prawn (0.13.2)
       pdf-reader (~> 1.2)
       ruby-rc4
       ttfunk (~> 1.0.3)
-    psych (5.1.2)
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.3.1)
+      date
       stringio
-    public_suffix (6.0.1)
-    puma (5.6.8)
+    public_suffix (7.0.5)
+    puma (5.6.9)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.14)
+    rack (2.2.23)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
-    rack-mini-profiler (2.3.4)
+    rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-session (1.0.2)
       rack (< 3)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.0)
+    rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.1.3.4)
-      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    rails (8.0.5)
+      actioncable (= 8.0.5)
+      actionmailbox (= 8.0.5)
+      actionmailer (= 8.0.5)
+      actionpack (= 8.0.5)
+      actiontext (= 8.0.5)
+      actionview (= 8.0.5)
+      activejob (= 8.0.5)
+      activemodel (= 8.0.5)
+      activerecord (= 8.0.5)
+      activestorage (= 8.0.5)
+      activesupport (= 8.0.5)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
+      railties (= 8.0.5)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (8.0.5)
+      actionpack (= 8.0.5)
+      activesupport (= 8.0.5)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
@@ -444,96 +472,110 @@ GEM
       ffi
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
-    rdoc (6.7.0)
+    rdoc (7.2.0)
+      erb
       psych (>= 4.0.0)
+      tsort
+    readline (0.0.4)
+      reline
     redis (4.8.1)
-    regexp_parser (2.9.2)
-    reline (0.5.9)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-    rexml (3.3.9)
-    rspec (3.13.0)
+    responders (3.2.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
+    rexml (3.4.4)
+    rspec (3.13.2)
       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.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.1.1)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rspec-support (3.13.7)
+    rubocop (1.86.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-minitest (0.35.1)
-      rubocop (>= 1.61, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.28.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails-omakase (1.0.0)
-      rubocop
-      rubocop-minitest
-      rubocop-performance
-      rubocop-rails
-    rubocop-rspec (3.0.3)
-      rubocop (~> 1.61)
-    rubocop-rspec_rails (2.30.0)
-      rubocop (~> 1.61)
-      rubocop-rspec (~> 3, >= 3.0.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails-omakase (1.1.0)
+      rubocop (>= 1.72)
+      rubocop-performance (>= 1.24)
+      rubocop-rails (>= 2.30)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
-    ruby-vips (2.2.2)
+    ruby-vips (2.3.0)
       ffi (~> 1.12)
       logger
-    rubyzip (2.3.2)
-    safely_block (0.4.0)
+    rubyzip (2.4.1)
+    safely_block (1.0.0)
     sass (3.4.25)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    selenium-webdriver (4.16.0)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    securerandom (0.4.1)
+    selenium-webdriver (4.42.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
@@ -556,86 +598,96 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     sitemap_generator (6.3.0)
       builder (~> 3.0)
     slackistrano (0.1.9)
       capistrano (>= 3.0.1)
       json
-    spring (4.2.1)
-    sprockets (3.7.2)
+    spring (4.4.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.5.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sshkit (1.23.0)
+    sshkit (1.25.0)
       base64
+      logger
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    ssrf_filter (1.1.2)
-    stringio (3.1.1)
+      ostruct
+    ssrf_filter (1.5.0)
+    stringio (3.2.0)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
     susy (2.2.14)
       sass (>= 3.3.0, < 3.5)
     sync (0.5.0)
-    term-ansicolor (1.11.1)
-      tins (~> 1.0)
-    terser (1.2.3)
+    term-ansicolor (1.11.3)
+      tins (~> 1)
+    terser (1.2.7)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
-    tilt (2.4.0)
-    timeout (0.4.3)
-    tins (1.33.0)
+    thor (1.5.0)
+    tilt (2.7.0)
+    timeout (0.6.1)
+    tins (1.52.0)
       bigdecimal
+      mize (~> 0.6)
+      readline
       sync
+    tsort (0.2.0)
     ttfunk (1.0.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    useragent (0.16.11)
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
+    web-console (4.3.0)
+      actionview (>= 8.0.0)
       bindex (>= 0.4.0)
-      railties (>= 6.0.0)
+      railties (>= 8.0.0)
     webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
-    webrick (1.8.2)
+    webrick (1.9.2)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wicked (2.0.0)
       railties (>= 3.0.7)
-    wkhtmltopdf-binary (0.12.6.7)
+    wkhtmltopdf-binary (0.12.6.10)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.7.5)
 
 PLATFORMS
-  ruby
+  x86_64-linux-gnu
 
 DEPENDENCIES
   active_model_serializers (= 0.8.4)
   active_storage_validations (~> 2.0)
-  acts-as-taggable-on (~> 10.0)
+  acts-as-taggable-on (~> 12.0)
   ahoy_matey (~> 5.0, >= 5.0.2)
-  annotaterb (~> 4.10.2)
+  annotaterb (~> 4.22.0)
   appsignal (~> 3.13.1)
   aws-sdk-s3 (~> 1.143)
-  base64 (= 0.1.1)
+  base64 (= 0.2.0)
   bcrypt_pbkdf (= 1.1.0)
   bootsnap (>= 1.4.4)
   bootstrap-sass (= 2.3.2.2)
+  brakeman
   byebug
   cancancan (~> 3.5)
   capistrano (= 3.18.0)
@@ -651,6 +703,7 @@ DEPENDENCIES
   chartkick (~> 5.0, >= 5.0.5)
   coffee-rails (~> 5.0)
   coveralls_reborn (~> 0.28.0)
+  csv (~> 3.3.5)
   database_cleaner (~> 2.0, >= 2.0.2)
   devise (~> 4.9, >= 4.9.3)
   dotenv-rails (= 2.0.1)
@@ -658,7 +711,8 @@ DEPENDENCIES
   ember-data-source (= 1.13.0)
   ember-rails (~> 0.21.0)
   ember-source (= 1.8.0)
-  factory_bot_rails (= 5.2.0)
+  erb (~> 6.0.2)
+  factory_bot_rails (~> 6.5.1)
   file_exists (~> 0.2.0)
   geoip (= 1.3.5)
   gon (~> 6.4)
@@ -670,13 +724,14 @@ DEPENDENCIES
   json_spec (~> 1.1, >= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
-  listen (~> 3.3)
+  listen (~> 3.10.0)
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
+  net-ssh (= 7.3.2)
   nokogiri (~> 1.18)
   oj (~> 3.16, >= 3.16.3)
-  paper_trail (= 15.1.0)
+  paper_trail (~> 17.0.0)
   pdfkit (~> 0.8.7.3)
   pg (~> 1.5, >= 1.5.4)
   pg_array_parser (~> 0.0.9)
@@ -684,8 +739,8 @@ DEPENDENCIES
   prawn (= 0.13.2)
   puma (~> 5.0)
   rack-cors
-  rack-mini-profiler (~> 2.0)
-  rails (= 7.1.3.4)
+  rack-mini-profiler (~> 4.0.1)
+  rails (= 8.0.5)
   rails-controller-testing
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)
@@ -693,7 +748,7 @@ DEPENDENCIES
   request_store (~> 1.5, >= 1.5.1)
   responders (~> 3.1, >= 3.1.1)
   rspec-collection_matchers (~> 1.2, >= 1.2.1)
-  rspec-rails (~> 6.1, >= 6.1.1)
+  rspec-rails (~> 7.1)
   rubocop
   rubocop-capybara
   rubocop-factory_bot
@@ -702,8 +757,8 @@ DEPENDENCIES
   rubocop-rspec
   rubocop-rspec_rails
   rubyzip (~> 2.3, >= 2.3.2)
-  sass-rails (~> 5.0)
-  selenium-webdriver (>= 4.0.0.rc1)
+  sass-rails (~> 6)
+  selenium-webdriver (~> 4.41)
   sidekiq (< 7)
   sidekiq-cron (~> 1.12)
   sidekiq-status (~> 3.0, >= 3.0.3)
@@ -712,19 +767,19 @@ DEPENDENCIES
   sitemap_generator (~> 6.3)
   slackistrano (= 0.1.9)
   spring
-  sprockets (= 3.7.2)
+  sprockets (~> 4)
   sprockets-rails
   strong_migrations (~> 1.7)
   susy (~> 2.2, >= 2.2.14)
   terser (~> 1.2.3)
   uuidtools (~> 2.2)
-  web-console (>= 4.1.0)
+  web-console
   webdrivers
   wicked (= 2.0.0)
   wkhtmltopdf-binary (~> 0.12.6.6)
 
 RUBY VERSION
-   ruby 3.2.5p208
+  ruby 3.4.9p82
 
 BUNDLED WITH
-   2.5.17
+  4.0.10
diff --git a/app/assets/config/mainfest.js b/app/assets/config/manifest.js
similarity index 100%
rename from app/assets/config/mainfest.js
rename to app/assets/config/manifest.js
diff --git a/app/assets/javascripts/species/controllers/taxon_concept_controller.js.coffee b/app/assets/javascripts/species/controllers/taxon_concept_controller.js.coffee
index c36238569..496512aec 100644
--- a/app/assets/javascripts/species/controllers/taxon_concept_controller.js.coffee
+++ b/app/assets/javascripts/species/controllers/taxon_concept_controller.js.coffee
@@ -255,10 +255,6 @@ Species.TaxonConceptController = Ember.ObjectController.extend Species.SearchCon
     if @get('nomenclatureNoteEn') == null || @get('nomenclatureNoteEn').length <= 0 then no else yes
   ).property('nomenclatureNoteEn')
 
-  nomenclatureChangesHappened: ( ->
-    @get('nomenclatureNotification')
-  ).property('nomenclatureNotification')
-
   actions:
     openSearchPage: (taxonFullName) ->
       @get("controllers.search").openSearchPage taxonFullName
diff --git a/app/assets/javascripts/species/models/taxon_concept.js.coffee b/app/assets/javascripts/species/models/taxon_concept.js.coffee
index 4fe14a219..7af123bfb 100644
--- a/app/assets/javascripts/species/models/taxon_concept.js.coffee
+++ b/app/assets/javascripts/species/models/taxon_concept.js.coffee
@@ -31,7 +31,6 @@ Species.TaxonConcept = DS.Model.extend
   nomenclatureNoteEn: DS.attr("string")
   nomenclatureNoteFr: DS.attr("string")
   nomenclatureNoteEs: DS.attr("string")
-  nomenclatureNotification: DS.attr("boolean")
 
   matchingNamesForDisplay: ( ->
     if @get('matchingNames') != undefined && @get('matchingNames').length > 0
diff --git a/app/assets/javascripts/species/templates/_tabs.handlebars b/app/assets/javascripts/species/templates/_tabs.handlebars
index dd6fa8448..c2332c334 100644
--- a/app/assets/javascripts/species/templates/_tabs.handlebars
+++ b/app/assets/javascripts/species/templates/_tabs.handlebars
@@ -1,12 +1,3 @@
-{{#if nomenclatureChangesHappened}}
-  <div id="nomenclature_banner" class="banner">
-    <p>
-      <i class="fa fa-info-circle"></i>
-      Changes to nomenclature have been made following changes adopted at the Seventeenth meeting of the Conference of the Parties to CITES
-    </p>
-  </div>
-{{/if}}
-
 <ul class="tabset top-level">
   <li {{bind-attr class="isSearchContextSpecies:active"}}>
     {{#link-to 'index'}}Search for Species{{/link-to}}
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index b4a7ddb10..efff1051d 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -1,6 +1,4 @@
 // Settings (mobile-first)
-@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap');
-
 $navy: #253848;
 $black: #2D2D2D;
 $medium-grey: #dddddd;
diff --git a/app/assets/stylesheets/species/all.scss b/app/assets/stylesheets/species/all.scss
index b28ec7f5e..a18e844fb 100755
--- a/app/assets/stylesheets/species/all.scss
+++ b/app/assets/stylesheets/species/all.scss
@@ -3,7 +3,6 @@
    License: none (public domain)
 */
 
-@import url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,600,700);
 @import './variables';
 
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
diff --git a/app/assets/stylesheets/species/nomenclature_changes_notification.scss b/app/assets/stylesheets/species/nomenclature_changes_notification.scss
deleted file mode 100644
index 430e00b1a..000000000
--- a/app/assets/stylesheets/species/nomenclature_changes_notification.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-div#nomenclature_banner {
-  background: #2D3237;
-  margin: 30px 0;
-  opacity: 0.8;
-}
-
-div#nomenclature_banner p {
-  color: #fff;
-  opacity: 1;
-  text-align: center;
-  margin: 0;
-  padding: 10px 40px 10px 25px;
-}
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
deleted file mode 100644
index d67269728..000000000
--- a/app/channels/application_cable/channel.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module ApplicationCable
-  class Channel < ActionCable::Channel::Base
-  end
-end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
deleted file mode 100644
index 0ff5442f4..000000000
--- a/app/channels/application_cable/connection.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module ApplicationCable
-  class Connection < ActionCable::Connection::Base
-  end
-end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 815be2559..dbb08db6e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,7 @@
 class ApplicationController < ActionController::Base
+  # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
+  allow_browser versions: :modern
+
   before_action :track_who_does_it_current_user
   before_action :set_locale
   before_action :configure_permitted_parameters, if: :devise_controller?
diff --git a/app/models/ahoy/visit.rb b/app/models/ahoy/visit.rb
index 648a62e0e..fb3bfdeca 100644
--- a/app/models/ahoy/visit.rb
+++ b/app/models/ahoy/visit.rb
@@ -48,6 +48,8 @@ class Visit < ApplicationRecord
     # (https://github.com/ankane/ahoy/blob/v1.0.1/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
     # However it has changed since version 1.4.0, from `id` to `visit_token`, and from `visitor_id` to `visitor_token`.
     # (https://github.com/ankane/ahoy/blob/v1.4.0/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
+    # Note that this will bypass custom methods on the original attribute, which thankfully we don't have:
+    # (https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#alias-attribute-now-bypasses-custom-methods-on-the-original-attribute)
     alias_attribute :visit_token, :id
     alias_attribute :visitor_token, :visitor_id
   end
diff --git a/app/serializers/dashboard_stats_serializer.rb b/app/serializers/dashboard_stats_serializer.rb
index c35a0cfba..19fea08b9 100644
--- a/app/serializers/dashboard_stats_serializer.rb
+++ b/app/serializers/dashboard_stats_serializer.rb
@@ -18,7 +18,7 @@ def meta
   end
 
   def cache_key
-    key = [
+    [
       self.class.name,
       @object.geo_entity.id,
       @object.kingdom,
@@ -26,7 +26,5 @@ def cache_key
       @object.time_range_start,
       @object.time_range_end
     ]
-    Rails.logger.debug { "CACHE KEY: #{key.inspect}" }
-    key
   end
 end
diff --git a/app/serializers/species/show_taxon_concept_serializer.rb b/app/serializers/species/show_taxon_concept_serializer.rb
index 83daf20a6..72d17ee7f 100644
--- a/app/serializers/species/show_taxon_concept_serializer.rb
+++ b/app/serializers/species/show_taxon_concept_serializer.rb
@@ -4,7 +4,7 @@ class Species::ShowTaxonConceptSerializer < ActiveModel::Serializer
   attributes :id, :parent_id, :full_name, :author_year, :standard_references,
     :common_names, :distributions, :subspecies, :distribution_references,
     :taxonomy, :kingdom_name, :phylum_name, :order_name, :class_name, :family_name,
-    :genus_name, :species_name, :rank_name, :name_status, :nomenclature_note_en, :nomenclature_notification
+    :genus_name, :species_name, :rank_name, :name_status, :nomenclature_note_en
 
   has_many :accepted_names, serializer: Species::AcceptedNameSerializer
   has_many :synonyms, serializer: Species::SynonymSerializer
@@ -17,12 +17,6 @@ def include_parent_id?
     @options[:trimmed] == 'false'
   end
 
-  def include_nomenclature_notification?
-    return true unless @options[:trimmed]
-
-    @options[:trimmed] == 'false'
-  end
-
   def include_kingdom_name?
     return true unless @options[:trimmed]
 
@@ -165,7 +159,7 @@ def distribution_references
   end
 
   def cache_key
-    key = [
+    [
       self.class.name,
       self.id,
       object.updated_at,
@@ -174,20 +168,5 @@ def cache_key
       scope.current_user ? true : false,
       @options[:trimmed] == 'true'
     ]
-    Rails.logger.debug { "CACHE KEY: #{key.inspect}" }
-    key
-  end
-
-  def nomenclature_notification
-    outputs = NomenclatureChange::Output.includes(:nomenclature_change).references(:nomenclature_change).where(
-      "
-        (taxon_concept_id = ? OR new_taxon_concept_id = ?) AND
-        nomenclature_changes.created_at > ? AND nomenclature_changes.status = 'submitted'
-        AND nomenclature_changes.created_at < ?
-      ",
-      object.id, object.id, 6.months.ago, Date.new(2017, 8, 1)
-    )
-
-    outputs.present?
   end
 end
diff --git a/app/views/layouts/mobile.html.erb b/app/views/layouts/mobile.html.erb
index f37c2e414..eef38bf48 100644
--- a/app/views/layouts/mobile.html.erb
+++ b/app/views/layouts/mobile.html.erb
@@ -7,6 +7,10 @@
   <meta name="description" content="">
   <meta name="author" content="">
 
+  <style lang="text/css">
+    @import url(//fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap);
+  </style>
+
   <%= stylesheet_link_tag "mobile" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
diff --git a/app/views/layouts/species.html.erb b/app/views/layouts/species.html.erb
index 054f63979..10a4f6590 100644
--- a/app/views/layouts/species.html.erb
+++ b/app/views/layouts/species.html.erb
@@ -8,7 +8,11 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <%= stylesheet_link_tag    "species" %>
+    <style lang="text/css">
+      @import url(//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,600,700);
+    </style>
+
+    <%= stylesheet_link_tag "species" %>
     <script type="text/javascript">
       EmberENV = {FEATURES: {'query-params-new' : true}};
     </script>
diff --git a/bin/brakeman b/bin/brakeman
new file mode 100755
index 000000000..ace1c9ba0
--- /dev/null
+++ b/bin/brakeman
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+ARGV.unshift("--ensure-latest")
+
+load Gem.bin_path("brakeman", "brakeman")
diff --git a/bin/dev b/bin/dev
new file mode 100755
index 000000000..5f91c2054
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec "./bin/rails", "server", *ARGV
diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index cd970544f..af841e1eb 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -4,6 +4,12 @@ if [[ "${@}" =~ "rails server" ]]; then
   rm -f ./tmp/pids/server.pid;
 fi
 
+# Enable jemalloc for reduced memory usage and latency.
+if [ -z "${LD_PRELOAD+x}" ]; then
+  LD_PRELOAD=$(find /usr/lib -name libjemalloc.so.2 -print -quit)
+  export LD_PRELOAD
+fi
+
 bundle install
 
 mkdir -p {./,spec/}public/downloads/checklist
@@ -31,7 +37,7 @@ mkdir -p {./,spec/}public/downloads/taxon_concepts_distributions
 mkdir -p {./,spec/}public/downloads/taxon_concepts_names
 
 # If running the rails server then create or migrate existing database
-# if [ "${1}" == "./bin/rails" ] && [ "${2}" == "server" ]; then
+# if [ "${@: -2:1}" == "./bin/rails" ] && [ "${@: -1:1}" == "server" ]; then
 #   ./bin/rails db:prepare
 # fi
 
diff --git a/bin/rubocop b/bin/rubocop
new file mode 100755
index 000000000..40330c0ff
--- /dev/null
+++ b/bin/rubocop
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+# explicit rubocop config increases performance slightly while avoiding config confusion.
+ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/bin/setup b/bin/setup
index 3cd5a9d78..2311239cd 100755
--- a/bin/setup
+++ b/bin/setup
@@ -3,6 +3,7 @@ require "fileutils"
 
 # path to your application root.
 APP_ROOT = File.expand_path("..", __dir__)
+APP_NAME = "sapi"
 
 def system!(*args)
   system(*args, exception: true)
@@ -14,7 +15,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
@@ -28,6 +28,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Restarting application server =="
-  system! "bin/rails restart"
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end
diff --git a/config/application.rb b/config/application.rb
index d08af56ef..852a14403 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -11,7 +11,7 @@
 module SAPI
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.1
+    config.load_defaults 8.0
 
     # Since Rails 5, on submit, submission buttons in `form_for` are disabled.
     # However, if errors are thrown and the whole form is not rerendered, then
diff --git a/config/deploy.rb b/config/deploy.rb
index ce0f0d011..f0a1295f9 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,7 +20,7 @@
 # set :format, :pretty
 
 set :rvm_type, :user
-set :rvm_ruby_version, '3.2.5'
+set :rvm_ruby_version, '3.4.9'
 
 # Sidekiq config
 set :sidekiq_service_unit_user, :system
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f994d2d70..df7e38c40 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -3,9 +3,7 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded any time
-  # it changes. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
+  # Make code changes take effect immediately without server restart.
   config.enable_reloading = true
 
   # Do not eager load code on boot.
@@ -40,6 +38,8 @@
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
   config.action_mailer.perform_caching = false
 
   # Print deprecation notices to the Rails logger.
@@ -61,12 +61,12 @@
   # Lets keep this for now, its development mode only.
   config.assets.debug = true
 
+  # Append comments with runtime information tags to SQL queries in logs.
+  config.active_record.query_log_tags_enabled = true
+
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
-
   # Enable DNS rebinding protection and other `Host` header attacks.
   # config.hosts = [
   #   "example.com",     # Allow requests from example.com
@@ -80,12 +80,12 @@
   # config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
-  # config.action_view.annotate_rendered_view_with_filenames = true
+  config.action_view.annotate_rendered_view_with_filenames = true
 
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
 
-  # Raise error when a before_action's only/except options reference missing actions
+  # Raise error when a before_action's only/except options reference missing actions.
   config.action_controller.raise_on_missing_callback_actions = true
 
   ###
diff --git a/config/environments/production.rb b/config/environments/production.rb
index d93986aa5..9c8d37da7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -6,19 +6,14 @@
   # Code is not reloaded between requests.
   config.enable_reloading = false
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
+  # Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
   config.eager_load = true
 
-  # Full error reports are disabled and caching is turned on.
+  # Full error reports are disabled.
   config.consider_all_requests_local = false
-  config.action_controller.perform_caching = true
 
-  # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
-  # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
-  # config.require_master_key = true
+  # Turn on fragment caching in view templates
+  config.action_controller.perform_caching = true
 
   # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
   config.public_file_server.enabled = false
@@ -29,8 +24,10 @@
   # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
 
-  # Do not fall back to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  # Cache assets for far-future expiry since they are all digest stamped.
+  config.public_file_server.headers = {
+    'cache-control' => "public, max-age=#{1.year.to_i}"
+  }
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
@@ -77,14 +74,18 @@
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
-  # "info" includes generic and useful information about system operation, but avoids logging too much
-  # information to avoid inadvertent exposure of personally identifiable information (PII). If you
-  # want to log everything, set the level to "debug".
+  # Change to "debug" to log everything (including potentially personally-identifiable information!)
   # config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
   # Leonardo: override default behaviour and hard-code warn.
   # @see https://github.com/heartcombo/devise#password-reset-tokens-and-rails-logs
   config.log_level = 'warn'
 
+  # Prevent health checks from clogging up the logs.
+  config.silence_healthcheck_path = '/up'
+
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false
+
   # Use a redis instance as a cache store on production.
   config.cache_store = :redis_cache_store, { url: ENV.fetch('SAPI_SIDEKIQ_REDIS_CACHE_URL', Rails.application.credentials.dig(:redis_cache, :url)) }
 
@@ -103,9 +104,6 @@
   # config.i18n.fallbacks = true
   config.i18n.fallbacks = false
 
-  # Don't log any deprecations.
-  config.active_support.report_deprecations = false
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
@@ -114,6 +112,7 @@
   #   "example.com",     # Allow requests from example.com
   #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
   # ]
+  #
   # Skip DNS rebinding protection for the default health check endpoint.
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
   config.hosts += ENV['ALLOWED_HOSTS'].split(',') if ENV['ALLOWED_HOSTS'].present?
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 0ecd0a654..3d9eb940e 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/integer/time'
-
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -29,6 +27,9 @@
   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 
+  # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#all-tests-now-respect-the-active-job-queue-adapter-config
+  config.active_job.queue_adapter = :test
+
   # Render exception templates for rescuable exceptions and raise for other exceptions.
   config.action_dispatch.show_exceptions = :rescuable
 
@@ -38,6 +39,8 @@
   # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
@@ -60,7 +63,7 @@
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Raise error when a before_action's only/except options reference missing actions
+  # Raise error when a before_action's only/except options reference missing actions.
   config.action_controller.raise_on_missing_callback_actions = true
 
   ###
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index ab670b5e6..0c5dd99ac 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,14 +1,16 @@
-Rails.application.config.middleware.insert_before 0, Rack::Cors do
-  allow do
-    app_cors_origins =
-      Rails.application.credentials.dig(
-        :cors, :origins
-      ) || []
+# Be sure to restart your server when you modify this file.
 
-    origins app_cors_origins&.map(&:strip)
+# Avoid CORS issues when API is called from the frontend app.
+# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin Ajax requests.
 
-    resource '*', headers: :any, methods: [
-      :get, :post, :patch, :put, :delete
-    ]
-  end
-end
+# Read more: https://github.com/cyu/rack-cors
+
+# Rails.application.config.middleware.insert_before 0, Rack::Cors do
+#   allow do
+#     origins "example.com"
+#
+#     resource "*",
+#       headers: :any,
+#       methods: [:get, :post, :put, :patch, :delete, :options, :head]
+#   end
+# end
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index c2d89e28a..c0b717f7e 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -4,5 +4,5 @@
 # Use this to limit dissemination of sensitive information.
 # See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
 ]
diff --git a/config/puma.rb b/config/puma.rb
index 58e1c205b..a248513b2 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,35 +1,41 @@
 # This configuration file will be evaluated by Puma. The top-level methods that
 # are invoked here are part of Puma's configuration DSL. For more information
 # about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
-
-# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers: a minimum and maximum.
-# Any libraries that use thread pools should be configured to match
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum; this matches the default thread size of Active Record.
-max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
-min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
-threads min_threads_count, max_threads_count
-
-# Specifies that the worker count should equal the number of processors in production.
-if ENV['RAILS_ENV'] == 'production'
-  require 'concurrent-ruby'
-  worker_count = Integer(ENV.fetch('WEB_CONCURRENCY') { Concurrent.physical_processor_count })
-  workers worker_count if worker_count > 1
-end
-
-# Specifies the `worker_timeout` threshold that Puma will use to wait before
-# terminating a worker in development environments.
-worker_timeout 3600 if ENV.fetch('RAILS_ENV', 'development') == 'development'
+#
+# Puma starts a configurable number of processes (workers) and each process
+# serves each request in a thread from an internal thread pool.
+#
+# You can control the number of workers using ENV["WEB_CONCURRENCY"]. You
+# should only set this value when you want to run 2 or more workers. The
+# default is already 1.
+#
+# The ideal number of threads per worker depends both on how much time the
+# application spends waiting for IO operations and on how much you wish to
+# prioritize throughput over latency.
+#
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
+#
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
+#
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 3)
+threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
-port ENV.fetch('PORT') { 3000 }
+port ENV.fetch("PORT", 3000)
 
-# Specifies the `environment` that Puma will run in.
-environment ENV.fetch('RAILS_ENV') { 'development' }
+# Allow puma to be restarted by `bin/rails restart` command.
+plugin :tmp_restart
 
-# Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
+# Run the Solid Queue supervisor inside of Puma for single-server deployments
+plugin :solid_queue if ENV["SOLID_QUEUE_IN_PUMA"]
 
-# Allow puma to be restarted by `rails restart` command.
-plugin :tmp_restart
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]
diff --git a/public/400.html b/public/400.html
new file mode 100644
index 000000000..282dbc8cc
--- /dev/null
+++ b/public/400.html
@@ -0,0 +1,114 @@
+<!doctype html>
+
+<html lang="en">
+
+  <head>
+
+    <title>The server cannot process the request due to a client error (400 Bad Request)</title>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1, width=device-width">
+    <meta name="robots" content="noindex, nofollow">
+
+    <style>
+
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
+
+      * {
+        margin: 0;
+      }
+
+      html {
+        font-size: 16px;
+      }
+
+      body {
+        background: #FFF;
+        color: #261B23;
+        display: grid;
+        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Aptos, Roboto, "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        font-size: clamp(1rem, 2.5vw, 2rem);
+        -webkit-font-smoothing: antialiased;
+        font-style: normal;
+        font-weight: 400;
+        letter-spacing: -0.0025em;
+        line-height: 1.4;
+        min-height: 100vh;
+        place-items: center;
+        text-rendering: optimizeLegibility;
+        -webkit-text-size-adjust: 100%;
+      }
+
+      a {
+        color: inherit;
+        font-weight: 700;
+        text-decoration: underline;
+        text-underline-offset: 0.0925em;
+      }
+
+      b, strong {
+        font-weight: 700;
+      }
+
+      i, em {
+        font-style: italic;
+      }
+
+      main {
+        display: grid;
+        gap: 1em;
+        padding: 2em;
+        place-items: center;
+        text-align: center;
+      }
+
+      main header {
+        width: min(100%, 12em);
+      }
+
+      main header svg {
+        height: auto;
+        max-width: 100%;
+        width: 100%;
+      }
+
+      main article {
+        width: min(100%, 30em);
+      }
+
+      main article p {
+        font-size: 75%;
+      }
+
+      main article br {
+
+        display: none;
+
+        @media(min-width: 48em) {
+          display: inline;
+        }
+
+      }
+
+    </style>
+
+  </head>
+
+  <body>
+
+    <!-- This file lives in public/400.html -->
+
+    <main>
+      <header>
+        <svg height="172" viewBox="0 0 480 172" width="480" xmlns="http://www.w3.org/2000/svg"><path d="m124.48 3.00509-45.6889 100.02991h26.2239v-28.1168h38.119v28.1168h21.628v35.145h-21.628v30.82h-37.308v-30.82h-72.1833v-31.901l50.2851-103.27391zm115.583 168.69891c-40.822 0-64.884-35.146-64.884-85.7015 0-50.5554 24.062-85.700907 64.884-85.700907 40.823 0 64.884 35.145507 64.884 85.700907 0 50.5555-24.061 85.7015-64.884 85.7015zm0-133.2831c-17.572 0-22.709 21.8984-22.709 47.5816 0 25.6835 5.137 47.5815 22.709 47.5815 17.303 0 22.71-21.898 22.71-47.5815 0-25.6832-5.407-47.5816-22.71-47.5816zm140.456 133.2831c-40.823 0-64.884-35.146-64.884-85.7015 0-50.5554 24.061-85.700907 64.884-85.700907 40.822 0 64.884 35.145507 64.884 85.700907 0 50.5555-24.062 85.7015-64.884 85.7015zm0-133.2831c-17.573 0-22.71 21.8984-22.71 47.5816 0 25.6835 5.137 47.5815 22.71 47.5815 17.302 0 22.709-21.898 22.709-47.5815 0-25.6832-5.407-47.5816-22.709-47.5816z" fill="#f0eff0"/><path d="m123.606 85.4445c3.212 1.0523 5.538 4.2089 5.538 8.0301 0 6.1472-4.209 9.5254-11.298 9.5254h-15.617v-34.0033h14.565c7.089 0 11.353 3.1566 11.353 9.2484 0 3.6551-2.049 6.3134-4.541 7.1994zm-12.904-2.9905h5.095c2.603 0 3.988-.9968 3.988-3.1013 0-2.1044-1.385-3.0459-3.988-3.0459h-5.095zm0 6.6456v6.5902h5.981c2.492 0 3.877-1.3291 3.877-3.2674 0-2.049-1.385-3.3228-3.877-3.3228zm43.786 13.9004h-8.362v-1.274c-.831.831-3.323 1.717-5.981 1.717-4.929 0-9.083-2.769-9.083-8.0301 0-4.818 4.154-7.9193 9.581-7.9193 2.049 0 4.486.6646 5.483 1.3845v-1.606c0-1.606-.942-2.9905-3.046-2.9905-1.606 0-2.548.7199-2.935 1.8275h-8.197c.72-4.8181 4.985-8.6393 11.409-8.6393 7.088 0 11.131 3.7659 11.131 10.2453zm-8.362-6.9779v-1.4399c-.554-1.0522-2.049-1.7167-3.655-1.7167-1.717 0-3.434.7199-3.434 2.3813 0 1.7168 1.717 2.4367 3.434 2.4367 1.606 0 3.101-.6645 3.655-1.6614zm27.996 6.9779v-1.994c-1.163 1.329-3.599 2.548-6.147 2.548-7.199 0-11.131-5.8151-11.131-13.0145s3.932-13.0143 11.131-13.0143c2.548 0 4.984 1.2184 6.147 2.5475v-13.0697h8.695v35.997zm0-9.1931v-6.5902c-.664-1.3291-2.159-2.326-3.821-2.326-2.99 0-4.763 2.4368-4.763 5.6488s1.773 5.5934 4.763 5.5934c1.717 0 3.157-.9415 3.821-2.326zm35.471-2.049h-3.101v11.2421h-8.806v-34.0033h15.285c7.31 0 12.35 4.1535 12.35 11.5744 0 5.1503-2.603 8.6947-6.757 10.2453l7.975 12.1836h-9.858zm-3.101-15.2849v8.1962h5.538c3.156 0 4.596-1.606 4.596-4.0981s-1.44-4.0981-4.596-4.0981zm36.957 17.8323h8.03c-.886 5.7597-5.206 9.2487-11.685 9.2487-7.643 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.316-13.0143 12.515-13.0143 7.643 0 11.962 5.095 11.962 12.5159v2.1598h-16.115c.277 2.9905 1.827 4.5965 4.32 4.5965 1.772 0 3.156-.7753 3.655-2.4921zm-3.822-10.0237c-2.049 0-3.433 1.2737-3.987 3.5997h7.532c-.111-2.0491-1.385-3.5997-3.545-3.5997zm30.98 27.5234v-10.799c-1.163 1.329-3.6 2.548-6.147 2.548-7.2 0-11.132-5.9259-11.132-13.0145 0-7.144 3.932-13.0143 11.132-13.0143 2.547 0 4.984 1.2184 6.147 2.5475v-1.9937h8.695v33.726zm0-17.9981v-6.5902c-.665-1.3291-2.105-2.326-3.821-2.326-2.991 0-4.763 2.4368-4.763 5.6488s1.772 5.5934 4.763 5.5934c1.661 0 3.156-.9415 3.821-2.326zm36.789-15.7279v24.921h-8.695v-2.16c-1.329 1.551-3.821 2.714-6.646 2.714-5.482 0-8.75-3.5999-8.75-9.1379v-16.3371h8.64v14.288c0 2.1045.996 3.5997 3.212 3.5997 1.606 0 3.101-1.0522 3.544-2.769v-15.1187zm19.084 16.2263h8.03c-.886 5.7597-5.206 9.2487-11.685 9.2487-7.643 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.316-13.0143 12.515-13.0143 7.643 0 11.963 5.095 11.963 12.5159v2.1598h-16.116c.277 2.9905 1.828 4.5965 4.32 4.5965 1.772 0 3.156-.7753 3.655-2.4921zm-3.822-10.0237c-2.049 0-3.433 1.2737-3.987 3.5997h7.532c-.111-2.0491-1.385-3.5997-3.545-3.5997zm13.428 11.0206h8.474c.387 1.3845 1.606 2.1598 3.156 2.1598 1.44 0 2.548-.5538 2.548-1.7168 0-.9414-.72-1.2737-1.939-1.5506l-4.873-.9969c-4.154-.886-6.867-2.8797-6.867-7.2547 0-5.3165 4.762-8.4178 10.633-8.4178 6.812 0 10.522 3.1567 11.297 8.0855h-8.03c-.277-1.0522-1.052-1.9937-3.046-1.9937-1.273 0-2.326.5538-2.326 1.6614 0 .7753.554 1.163 1.717 1.3845l4.929 1.163c4.541 1.0522 6.978 3.4335 6.978 7.4763 0 5.3168-4.818 8.2518-10.91 8.2518-6.369 0-10.965-2.88-11.741-8.2518zm27.538-.8861v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.584v6.8671h5.205v6.7564h-5.205v8.307c0 1.9383.941 2.769 2.658 2.769.941 0 1.993-.2216 2.769-.5538v7.3654c-.997.443-2.88.775-4.818.775-5.871 0-9.193-2.769-9.193-9.0819z" fill="#d30001"/></svg>
+      </header>
+      <article>
+        <p><strong>The server cannot process the request due to a client error.</strong> Please check the request and try again. If you’re the application owner check the logs for more information.</p>
+      </article>
+    </main>
+
+  </body>
+
+</html>
diff --git a/public/404.html b/public/404.html
index f028a6e83..c0670bc87 100644
--- a/public/404.html
+++ b/public/404.html
@@ -1,69 +1,114 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <title>The page you were looking for doesn't exist (404)</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-    .rails-default-error-page {
-      background-color: #EFEFEF;
-      color: #2E2F30;
-      text-align: center;
-      font-family: arial, sans-serif;
-      margin: 0;
-    }
-
-    .rails-default-error-page div.dialog {
-      width: 95%;
-      max-width: 33em;
-      margin: 4em auto 0;
-    }
-
-    .rails-default-error-page div.dialog>div {
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #BBB;
-      border-top: #B00100 solid 4px;
-      border-top-left-radius: 9px;
-      border-top-right-radius: 9px;
-      background-color: white;
-      padding: 7px 12% 0;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-    }
-
-    .rails-default-error-page h1 {
-      font-size: 100%;
-      color: #730E15;
-      line-height: 1.5em;
-    }
-
-    .rails-default-error-page div.dialog>p {
-      margin: 0 0 1em;
-      padding: 1em;
-      background-color: #F7F7F7;
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #999;
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      border-top-color: #DADADA;
-      color: #666;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-    }
-  </style>
-</head>
-
-<body class="rails-default-error-page">
-  <!-- This file lives in public/404.html -->
-  <div class="dialog">
-    <div>
-      <h1>The page you were looking for doesn't exist.</h1>
-      <p>You may have mistyped the address or the page may have moved.</p>
-    </div>
-    <p>If you are the application owner check the logs for more information.</p>
-  </div>
-</body>
+<!doctype html>
+
+<html lang="en">
+
+  <head>
+
+    <title>The page you were looking for doesn’t exist (404 Not found)</title>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1, width=device-width">
+    <meta name="robots" content="noindex, nofollow">
+
+    <style>
+
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
+
+      * {
+        margin: 0;
+      }
+
+      html {
+        font-size: 16px;
+      }
+
+      body {
+        background: #FFF;
+        color: #261B23;
+        display: grid;
+        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Aptos, Roboto, "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        font-size: clamp(1rem, 2.5vw, 2rem);
+        -webkit-font-smoothing: antialiased;
+        font-style: normal;
+        font-weight: 400;
+        letter-spacing: -0.0025em;
+        line-height: 1.4;
+        min-height: 100vh;
+        place-items: center;
+        text-rendering: optimizeLegibility;
+        -webkit-text-size-adjust: 100%;
+      }
+
+      a {
+        color: inherit;
+        font-weight: 700;
+        text-decoration: underline;
+        text-underline-offset: 0.0925em;
+      }
+
+      b, strong {
+        font-weight: 700;
+      }
+
+      i, em {
+        font-style: italic;
+      }
+
+      main {
+        display: grid;
+        gap: 1em;
+        padding: 2em;
+        place-items: center;
+        text-align: center;
+      }
+
+      main header {
+        width: min(100%, 12em);
+      }
+
+      main header svg {
+        height: auto;
+        max-width: 100%;
+        width: 100%;
+      }
+
+      main article {
+        width: min(100%, 30em);
+      }
+
+      main article p {
+        font-size: 75%;
+      }
+
+      main article br {
+
+        display: none;
+
+        @media(min-width: 48em) {
+          display: inline;
+        }
+
+      }
+
+    </style>
+
+  </head>
+
+  <body>
+
+    <!-- This file lives in public/404.html -->
+
+    <main>
+      <header>
+        <svg height="172" viewBox="0 0 480 172" width="480" xmlns="http://www.w3.org/2000/svg"><path d="m124.48 3.00509-45.6889 100.02991h26.2239v-28.1168h38.119v28.1168h21.628v35.145h-21.628v30.82h-37.308v-30.82h-72.1833v-31.901l50.2851-103.27391zm115.583 168.69891c-40.822 0-64.884-35.146-64.884-85.7015 0-50.5554 24.062-85.700907 64.884-85.700907 40.823 0 64.884 35.145507 64.884 85.700907 0 50.5555-24.061 85.7015-64.884 85.7015zm0-133.2831c-17.572 0-22.709 21.8984-22.709 47.5816 0 25.6835 5.137 47.5815 22.709 47.5815 17.303 0 22.71-21.898 22.71-47.5815 0-25.6832-5.407-47.5816-22.71-47.5816zm165.328-35.41581-45.689 100.02991h26.224v-28.1168h38.119v28.1168h21.628v35.145h-21.628v30.82h-37.308v-30.82h-72.184v-31.901l50.285-103.27391z" fill="#f0eff0"/><path d="m157.758 68.9967v34.0033h-7.199l-14.233-19.8814v19.8814h-8.584v-34.0033h8.307l13.125 18.7184v-18.7184zm28.454 21.5428c0 7.6978-5.15 13.0145-12.737 13.0145-7.532 0-12.738-5.3167-12.738-13.0145s5.206-13.0143 12.738-13.0143c7.587 0 12.737 5.3165 12.737 13.0143zm-8.528 0c0-3.4336-1.496-5.8703-4.209-5.8703-2.659 0-4.154 2.4367-4.154 5.8703s1.495 5.8149 4.154 5.8149c2.713 0 4.209-2.3813 4.209-5.8149zm13.184 3.8766v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.584v6.8671h5.205v6.7564h-5.205v8.307c0 1.9383.941 2.769 2.658 2.769.941 0 1.994-.2216 2.769-.5538v7.3654c-.997.443-2.88.775-4.818.775-5.87 0-9.193-2.769-9.193-9.0819zm37.027 8.5839h-8.806v-34.0033h23.924v7.6978h-15.118v6.7564h13.9v7.5316h-13.9zm41.876-12.4605c0 7.6978-5.15 13.0145-12.737 13.0145-7.532 0-12.738-5.3167-12.738-13.0145s5.206-13.0143 12.738-13.0143c7.587 0 12.737 5.3165 12.737 13.0143zm-8.529 0c0-3.4336-1.495-5.8703-4.208-5.8703-2.659 0-4.154 2.4367-4.154 5.8703s1.495 5.8149 4.154 5.8149c2.713 0 4.208-2.3813 4.208-5.8149zm35.337-12.4605v24.921h-8.695v-2.16c-1.329 1.551-3.821 2.714-6.646 2.714-5.482 0-8.75-3.5999-8.75-9.1379v-16.3371h8.64v14.288c0 2.1045.997 3.5997 3.212 3.5997 1.606 0 3.101-1.0522 3.544-2.769v-15.1187zm4.076 24.921v-24.921h8.694v2.1598c1.385-1.5506 3.822-2.7136 6.701-2.7136 5.538 0 8.806 3.5997 8.806 9.1377v16.3371h-8.639v-14.2327c0-2.049-1.053-3.5443-3.268-3.5443-1.717 0-3.156.9969-3.6 2.7136v15.0634zm44.113 0v-1.994c-1.163 1.329-3.6 2.548-6.147 2.548-7.2 0-11.132-5.8151-11.132-13.0145s3.932-13.0143 11.132-13.0143c2.547 0 4.984 1.2184 6.147 2.5475v-13.0697h8.695v35.997zm0-9.1931v-6.5902c-.665-1.3291-2.16-2.326-3.821-2.326-2.991 0-4.763 2.4368-4.763 5.6488s1.772 5.5934 4.763 5.5934c1.717 0 3.156-.9415 3.821-2.326z" fill="#d30001"/></svg>
+      </header>
+      <article>
+        <p><strong>The page you were looking for doesn’t exist.</strong> You may have mistyped the address or the page may have moved. If you’re the application owner check the logs for more information.</p>
+      </article>
+    </main>
+
+  </body>
 
 </html>
diff --git a/public/406-unsupported-browser.html b/public/406-unsupported-browser.html
new file mode 100644
index 000000000..9532a9ccd
--- /dev/null
+++ b/public/406-unsupported-browser.html
@@ -0,0 +1,114 @@
+<!doctype html>
+
+<html lang="en">
+
+  <head>
+
+    <title>Your browser is not supported (406 Not Acceptable)</title>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1, width=device-width">
+    <meta name="robots" content="noindex, nofollow">
+
+    <style>
+
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
+
+      * {
+        margin: 0;
+      }
+
+      html {
+        font-size: 16px;
+      }
+
+      body {
+        background: #FFF;
+        color: #261B23;
+        display: grid;
+        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Aptos, Roboto, "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        font-size: clamp(1rem, 2.5vw, 2rem);
+        -webkit-font-smoothing: antialiased;
+        font-style: normal;
+        font-weight: 400;
+        letter-spacing: -0.0025em;
+        line-height: 1.4;
+        min-height: 100vh;
+        place-items: center;
+        text-rendering: optimizeLegibility;
+        -webkit-text-size-adjust: 100%;
+      }
+
+      a {
+        color: inherit;
+        font-weight: 700;
+        text-decoration: underline;
+        text-underline-offset: 0.0925em;
+      }
+
+      b, strong {
+        font-weight: 700;
+      }
+
+      i, em {
+        font-style: italic;
+      }
+
+      main {
+        display: grid;
+        gap: 1em;
+        padding: 2em;
+        place-items: center;
+        text-align: center;
+      }
+
+      main header {
+        width: min(100%, 12em);
+      }
+
+      main header svg {
+        height: auto;
+        max-width: 100%;
+        width: 100%;
+      }
+
+      main article {
+        width: min(100%, 30em);
+      }
+
+      main article p {
+        font-size: 75%;
+      }
+
+      main article br {
+
+        display: none;
+
+        @media(min-width: 48em) {
+          display: inline;
+        }
+
+      }
+
+    </style>
+
+  </head>
+
+  <body>
+
+    <!-- This file lives in public/406-unsupported-browser.html -->
+
+    <main>
+      <header>
+        <svg height="172" viewBox="0 0 480 172" width="480" xmlns="http://www.w3.org/2000/svg"><path d="m124.48 3.00509-45.6889 100.02991h26.2239v-28.1168h38.119v28.1168h21.628v35.145h-21.628v30.82h-37.308v-30.82h-72.1833v-31.901l50.2851-103.27391zm115.583 168.69891c-40.822 0-64.884-35.146-64.884-85.7015 0-50.5554 24.062-85.700907 64.884-85.700907 40.823 0 64.884 35.145507 64.884 85.700907 0 50.5555-24.061 85.7015-64.884 85.7015zm0-133.2831c-17.572 0-22.709 21.8984-22.709 47.5816 0 25.6835 5.137 47.5815 22.709 47.5815 17.303 0 22.71-21.898 22.71-47.5815 0-25.6832-5.407-47.5816-22.71-47.5816zm202.906 9.7326h-41.093c-2.433-7.2994-7.84-12.4361-17.302-12.4361-16.221 0-25.413 17.5728-25.954 34.8752v1.3517c5.137-7.0291 16.221-12.4361 30.82-12.4361 33.524 0 54.881 24.0612 54.881 53.7998 0 33.253-23.791 58.396-61.64 58.396-21.628 0-39.741-10.003-50.825-27.576-9.733-14.599-13.788-32.442-13.788-54.3406 0-51.9072 24.331-89.485807 66.236-89.485807 32.712 0 53.258 18.654107 58.665 47.851907zm-82.727 66.2355c0 13.247 9.463 22.439 22.71 22.439 12.977 0 22.439-9.192 22.439-22.439 0-13.517-9.462-22.7091-22.439-22.7091-13.247 0-22.71 9.1921-22.71 22.7091z" fill="#f0eff0"/><path d="m100.761 68.9967v34.0033h-7.1991l-14.2326-19.8814v19.8814h-8.5839v-34.0033h8.307l13.125 18.7184v-18.7184zm28.454 21.5428c0 7.6978-5.15 13.0145-12.737 13.0145-7.532 0-12.738-5.3167-12.738-13.0145s5.206-13.0143 12.738-13.0143c7.587 0 12.737 5.3165 12.737 13.0143zm-8.529 0c0-3.4336-1.495-5.8703-4.208-5.8703-2.659 0-4.154 2.4367-4.154 5.8703s1.495 5.8149 4.154 5.8149c2.713 0 4.208-2.3813 4.208-5.8149zm13.185 3.8766v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.584v6.8671h5.205v6.7564h-5.205v8.307c0 1.9383.941 2.769 2.658 2.769.941 0 1.994-.2216 2.769-.5538v7.3654c-.997.443-2.88.775-4.818.775-5.87 0-9.193-2.769-9.193-9.0819zm39.02-25.4194h9.083l12.958 34.0033h-9.027l-2.436-6.5902h-12.35l-2.381 6.5902h-8.806zm4.431 10.5222-3.489 9.5807h6.978zm17.44 11.0206c0-7.6978 5.095-13.0143 12.572-13.0143 6.701 0 10.854 3.9874 11.574 9.8023h-8.418c-.221-1.4953-1.384-2.6029-3.156-2.6029-2.437 0-3.988 2.2706-3.988 5.8149s1.551 5.7595 3.988 5.7595c1.772 0 2.935-1.0522 3.156-2.5475h8.418c-.72 5.7596-4.873 9.8025-11.574 9.8025-7.477 0-12.572-5.3167-12.572-13.0145zm25.676 0c0-7.6978 5.095-13.0143 12.572-13.0143 6.701 0 10.854 3.9874 11.574 9.8023h-8.418c-.221-1.4953-1.384-2.6029-3.156-2.6029-2.437 0-3.988 2.2706-3.988 5.8149s1.551 5.7595 3.988 5.7595c1.772 0 2.935-1.0522 3.156-2.5475h8.418c-.72 5.7596-4.873 9.8025-11.574 9.8025-7.477 0-12.572-5.3167-12.572-13.0145zm42.013 3.7658h8.031c-.887 5.7597-5.206 9.2487-11.686 9.2487-7.642 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.317-13.0143 12.516-13.0143 7.643 0 11.962 5.095 11.962 12.5159v2.1598h-16.115c.277 2.9905 1.827 4.5965 4.319 4.5965 1.773 0 3.157-.7753 3.655-2.4921zm-3.821-10.0237c-2.049 0-3.433 1.2737-3.987 3.5997h7.532c-.111-2.0491-1.385-3.5997-3.545-3.5997zm23.4 16.7244v10.799h-8.694v-33.726h8.694v1.9937c1.163-1.3291 3.6-2.5475 6.148-2.5475 7.199 0 11.131 5.8703 11.131 13.0143 0 7.0886-3.932 13.0145-11.131 13.0145-2.548 0-4.985-1.219-6.148-2.548zm0-13.7893v6.5902c.665 1.3845 2.16 2.326 3.822 2.326 2.99 0 4.762-2.3814 4.762-5.5934s-1.772-5.6488-4.762-5.6488c-1.717 0-3.157.9969-3.822 2.326zm21.892 7.1994v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.584v6.8671h5.206v6.7564h-5.206v8.307c0 1.9383.941 2.769 2.658 2.769.942 0 1.994-.2216 2.769-.5538v7.3654c-.997.443-2.88.775-4.818.775-5.87 0-9.193-2.769-9.193-9.0819zm39.458 8.5839h-8.363v-1.274c-.83.831-3.322 1.717-5.981 1.717-4.928 0-9.082-2.769-9.082-8.0301 0-4.818 4.154-7.9193 9.581-7.9193 2.049 0 4.486.6646 5.482 1.3845v-1.606c0-1.606-.941-2.9905-3.045-2.9905-1.606 0-2.548.7199-2.936 1.8275h-8.196c.72-4.8181 4.984-8.6393 11.408-8.6393 7.089 0 11.132 3.7659 11.132 10.2453zm-8.363-6.9779v-1.4399c-.553-1.0522-2.049-1.7167-3.655-1.7167-1.716 0-3.433.7199-3.433 2.3813 0 1.7168 1.717 2.4367 3.433 2.4367 1.606 0 3.102-.6645 3.655-1.6614zm20.742 4.9839v1.994h-8.694v-35.997h8.694v13.0697c1.163-1.3291 3.6-2.5475 6.148-2.5475 7.199 0 11.131 5.8149 11.131 13.0143s-3.932 13.0145-11.131 13.0145c-2.548 0-4.985-1.219-6.148-2.548zm0-13.7893v6.5902c.665 1.3845 2.105 2.326 3.822 2.326 2.99 0 4.762-2.3814 4.762-5.5934s-1.772-5.6488-4.762-5.6488c-1.662 0-3.157.9969-3.822 2.326zm28.759-20.2137v35.997h-8.695v-35.997zm19.172 27.3023h8.03c-.886 5.7597-5.206 9.2487-11.685 9.2487-7.643 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.316-13.0143 12.516-13.0143 7.642 0 11.962 5.095 11.962 12.5159v2.1598h-16.116c.277 2.9905 1.828 4.5965 4.32 4.5965 1.772 0 3.157-.7753 3.655-2.4921zm-3.821-10.0237c-2.049 0-3.434 1.2737-3.988 3.5997h7.532c-.111-2.0491-1.384-3.5997-3.544-3.5997z" fill="#d30001"/></svg>
+      </header>
+      <article>
+        <p><strong>Your browser is not supported.</strong><br> Please upgrade your browser to continue.</p>
+      </article>
+    </main>
+
+  </body>
+
+</html>
diff --git a/public/422.html b/public/422.html
index 33dda348e..8bcf06014 100644
--- a/public/422.html
+++ b/public/422.html
@@ -1,69 +1,114 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <title>The change you wanted was rejected (422)</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-    .rails-default-error-page {
-      background-color: #EFEFEF;
-      color: #2E2F30;
-      text-align: center;
-      font-family: arial, sans-serif;
-      margin: 0;
-    }
-
-    .rails-default-error-page div.dialog {
-      width: 95%;
-      max-width: 33em;
-      margin: 4em auto 0;
-    }
-
-    .rails-default-error-page div.dialog>div {
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #BBB;
-      border-top: #B00100 solid 4px;
-      border-top-left-radius: 9px;
-      border-top-right-radius: 9px;
-      background-color: white;
-      padding: 7px 12% 0;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-    }
-
-    .rails-default-error-page h1 {
-      font-size: 100%;
-      color: #730E15;
-      line-height: 1.5em;
-    }
-
-    .rails-default-error-page div.dialog>p {
-      margin: 0 0 1em;
-      padding: 1em;
-      background-color: #F7F7F7;
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #999;
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      border-top-color: #DADADA;
-      color: #666;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-    }
-  </style>
-</head>
-
-<body class="rails-default-error-page">
-  <!-- This file lives in public/422.html -->
-  <div class="dialog">
-    <div>
-      <h1>The change you wanted was rejected.</h1>
-      <p>Maybe you tried to change something you didn't have access to.</p>
-    </div>
-    <p>If you are the application owner check the logs for more information.</p>
-  </div>
-</body>
+<!doctype html>
+
+<html lang="en">
+
+  <head>
+
+    <title>The change you wanted was rejected (422 Unprocessable Entity)</title>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1, width=device-width">
+    <meta name="robots" content="noindex, nofollow">
+
+    <style>
+
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
+
+      * {
+        margin: 0;
+      }
+
+      html {
+        font-size: 16px;
+      }
+
+      body {
+        background: #FFF;
+        color: #261B23;
+        display: grid;
+        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Aptos, Roboto, "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        font-size: clamp(1rem, 2.5vw, 2rem);
+        -webkit-font-smoothing: antialiased;
+        font-style: normal;
+        font-weight: 400;
+        letter-spacing: -0.0025em;
+        line-height: 1.4;
+        min-height: 100vh;
+        place-items: center;
+        text-rendering: optimizeLegibility;
+        -webkit-text-size-adjust: 100%;
+      }
+
+      a {
+        color: inherit;
+        font-weight: 700;
+        text-decoration: underline;
+        text-underline-offset: 0.0925em;
+      }
+
+      b, strong {
+        font-weight: 700;
+      }
+
+      i, em {
+        font-style: italic;
+      }
+
+      main {
+        display: grid;
+        gap: 1em;
+        padding: 2em;
+        place-items: center;
+        text-align: center;
+      }
+
+      main header {
+        width: min(100%, 12em);
+      }
+
+      main header svg {
+        height: auto;
+        max-width: 100%;
+        width: 100%;
+      }
+
+      main article {
+        width: min(100%, 30em);
+      }
+
+      main article p {
+        font-size: 75%;
+      }
+
+      main article br {
+
+        display: none;
+
+        @media(min-width: 48em) {
+          display: inline;
+        }
+
+      }
+
+    </style>
+
+  </head>
+
+  <body>
+
+    <!-- This file lives in public/422.html -->
+
+    <main>
+      <header>
+        <svg height="172" viewBox="0 0 480 172" width="480" xmlns="http://www.w3.org/2000/svg"><path d="m124.48 3.00509-45.6889 100.02991h26.2239v-28.1168h38.119v28.1168h21.628v35.145h-21.628v30.82h-37.308v-30.82h-72.1833v-31.901l50.2851-103.27391zm130.453 51.63681c0-8.9215-6.218-15.4099-15.681-15.4099-10.273 0-15.95 7.5698-16.491 16.4913h-44.608c3.244-30.8199 25.683-55.421707 61.099-55.421707 36.498 0 59.477 20.816907 59.477 51.636807 0 21.3577-14.869 36.7676-31.901 52.7186l-27.305 27.035h59.747v37.308h-120.306v-27.846l57.044-56.7736c11.084-11.8954 18.925-20.0059 18.925-29.7385zm140.455 0c0-8.9215-6.218-15.4099-15.68-15.4099-10.274 0-15.951 7.5698-16.492 16.4913h-44.608c3.245-30.8199 25.684-55.421707 61.1-55.421707 36.497 0 59.477 20.816907 59.477 51.636807 0 21.3577-14.87 36.7676-31.902 52.7186l-27.305 27.035h59.747v37.308h-120.305v-27.846l57.043-56.7736c11.085-11.8954 18.925-20.0059 18.925-29.7385z" fill="#f0eff0"/><path d="m19.3936 103.554c-8.9715 0-14.84183-5.0952-14.84183-14.4544v-20.1029h8.86083v19.3276c0 4.8181 2.2706 7.3102 5.981 7.3102 3.6551 0 5.9257-2.4921 5.9257-7.3102v-19.3276h8.8608v20.1583c0 9.3038-5.8149 14.399-14.7865 14.399zm18.734-.554v-24.921h8.6947v2.1598c1.3845-1.5506 3.8212-2.7136 6.701-2.7136 5.538 0 8.8054 3.5997 8.8054 9.1377v16.3371h-8.6393v-14.2327c0-2.049-1.0522-3.5443-3.2674-3.5443-1.7168 0-3.1567.9969-3.5997 2.7136v15.0634zm36.8584-1.994v10.799h-8.6946v-33.726h8.6946v1.9937c1.163-1.3291 3.5997-2.5475 6.1472-2.5475 7.1994 0 11.1314 5.8703 11.1314 13.0143 0 7.0886-3.932 13.0145-11.1314 13.0145-2.5475 0-4.9842-1.219-6.1472-2.548zm0-13.7893v6.5902c.6646 1.3845 2.1599 2.326 3.8213 2.326 2.9905 0 4.7626-2.3814 4.7626-5.5934s-1.7721-5.6488-4.7626-5.6488c-1.7168 0-3.1567.9969-3.8213 2.326zm36.789-9.2485v8.3624c-1.052-.5538-2.215-.7753-3.6-.7753-2.381 0-3.987 1.0522-4.43 2.8244v14.6203h-8.6949v-24.921h8.6949v2.2152c1.218-1.6614 3.156-2.769 5.648-2.769 1.108 0 1.994.2215 2.382.443zm26.769 12.5713c0 7.6978-5.15 13.0145-12.737 13.0145-7.532 0-12.738-5.3167-12.738-13.0145s5.206-13.0143 12.738-13.0143c7.587 0 12.737 5.3165 12.737 13.0143zm-8.528 0c0-3.4336-1.496-5.8703-4.209-5.8703-2.659 0-4.154 2.4367-4.154 5.8703s1.495 5.8149 4.154 5.8149c2.713 0 4.209-2.3813 4.209-5.8149zm10.352 0c0-7.6978 5.095-13.0143 12.571-13.0143 6.701 0 10.855 3.9874 11.574 9.8023h-8.417c-.222-1.4953-1.385-2.6029-3.157-2.6029-2.437 0-3.987 2.2706-3.987 5.8149s1.55 5.7595 3.987 5.7595c1.772 0 2.935-1.0522 3.157-2.5475h8.417c-.719 5.7596-4.873 9.8025-11.574 9.8025-7.476 0-12.571-5.3167-12.571-13.0145zm42.013 3.7658h8.03c-.886 5.7597-5.206 9.2487-11.685 9.2487-7.643 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.316-13.0143 12.516-13.0143 7.642 0 11.962 5.095 11.962 12.5159v2.1598h-16.116c.277 2.9905 1.828 4.5965 4.32 4.5965 1.772 0 3.156-.7753 3.655-2.4921zm-3.821-10.0237c-2.049 0-3.434 1.2737-3.988 3.5997h7.532c-.111-2.0491-1.385-3.5997-3.544-3.5997zm13.428 11.0206h8.473c.387 1.3845 1.606 2.1598 3.156 2.1598 1.44 0 2.548-.5538 2.548-1.7168 0-.9414-.72-1.2737-1.938-1.5506l-4.874-.9969c-4.153-.886-6.867-2.8797-6.867-7.2547 0-5.3165 4.763-8.4178 10.633-8.4178 6.812 0 10.522 3.1567 11.297 8.0855h-8.03c-.277-1.0522-1.052-1.9937-3.046-1.9937-1.273 0-2.326.5538-2.326 1.6614 0 .7753.554 1.163 1.717 1.3845l4.929 1.163c4.541 1.0522 6.978 3.4335 6.978 7.4763 0 5.3168-4.818 8.2518-10.91 8.2518-6.369 0-10.965-2.88-11.74-8.2518zm24.269 0h8.474c.387 1.3845 1.606 2.1598 3.156 2.1598 1.44 0 2.548-.5538 2.548-1.7168 0-.9414-.72-1.2737-1.939-1.5506l-4.873-.9969c-4.154-.886-6.867-2.8797-6.867-7.2547 0-5.3165 4.763-8.4178 10.633-8.4178 6.812 0 10.522 3.1567 11.297 8.0855h-8.03c-.277-1.0522-1.052-1.9937-3.046-1.9937-1.273 0-2.326.5538-2.326 1.6614 0 .7753.554 1.163 1.717 1.3845l4.929 1.163c4.541 1.0522 6.978 3.4335 6.978 7.4763 0 5.3168-4.818 8.2518-10.91 8.2518-6.369 0-10.965-2.88-11.741-8.2518zm47.918 7.6978h-8.363v-1.274c-.831.831-3.323 1.717-5.981 1.717-4.929 0-9.082-2.769-9.082-8.0301 0-4.818 4.153-7.9193 9.581-7.9193 2.049 0 4.485.6646 5.482 1.3845v-1.606c0-1.606-.941-2.9905-3.046-2.9905-1.606 0-2.547.7199-2.935 1.8275h-8.196c.72-4.8181 4.984-8.6393 11.408-8.6393 7.089 0 11.132 3.7659 11.132 10.2453zm-8.363-6.9779v-1.4399c-.554-1.0522-2.049-1.7167-3.655-1.7167-1.717 0-3.434.7199-3.434 2.3813 0 1.7168 1.717 2.4367 3.434 2.4367 1.606 0 3.101-.6645 3.655-1.6614zm20.742 4.9839v1.994h-8.695v-35.997h8.695v13.0697c1.163-1.3291 3.6-2.5475 6.147-2.5475 7.2 0 11.132 5.8149 11.132 13.0143s-3.932 13.0145-11.132 13.0145c-2.547 0-4.984-1.219-6.147-2.548zm0-13.7893v6.5902c.665 1.3845 2.105 2.326 3.821 2.326 2.991 0 4.763-2.3814 4.763-5.5934s-1.772-5.6488-4.763-5.6488c-1.661 0-3.156.9969-3.821 2.326zm28.759-20.2137v35.997h-8.695v-35.997zm19.172 27.3023h8.03c-.886 5.7597-5.206 9.2487-11.685 9.2487-7.643 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.316-13.0143 12.515-13.0143 7.643 0 11.962 5.095 11.962 12.5159v2.1598h-16.115c.277 2.9905 1.827 4.5965 4.32 4.5965 1.772 0 3.156-.7753 3.655-2.4921zm-3.822-10.0237c-2.049 0-3.433 1.2737-3.987 3.5997h7.532c-.111-2.0491-1.385-3.5997-3.545-3.5997zm25.461-15.2849h24.311v7.6424h-15.561v5.3165h14.232v7.4763h-14.232v5.8703h15.561v7.6978h-24.311zm27.942 34.0033v-24.921h8.694v2.1598c1.385-1.5506 3.822-2.7136 6.701-2.7136 5.538 0 8.806 3.5997 8.806 9.1377v16.3371h-8.639v-14.2327c0-2.049-1.053-3.5443-3.268-3.5443-1.717 0-3.157.9969-3.6 2.7136v15.0634zm29.991-8.5839v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.584v6.8671h5.206v6.7564h-5.206v8.307c0 1.9383.941 2.769 2.658 2.769.942 0 1.994-.2216 2.769-.5538v7.3654c-.997.443-2.88.775-4.818.775-5.87 0-9.193-2.769-9.193-9.0819zm26.161-16.3371v24.921h-8.694v-24.921zm.61-6.7564c0 2.8244-2.271 4.652-4.929 4.652s-4.929-1.8276-4.929-4.652c0-2.8797 2.271-4.7073 4.929-4.7073s4.929 1.8276 4.929 4.7073zm5.382 23.0935v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.584v6.8671h5.206v6.7564h-5.206v8.307c0 1.9383.941 2.769 2.658 2.769.941 0 1.994-.2216 2.769-.5538v7.3654c-.997.443-2.88.775-4.818.775-5.87 0-9.193-2.769-9.193-9.0819zm29.22 17.3889h-8.584l3.655-9.414-9.303-24.312h9.026l4.763 14.1773 4.652-14.1773h8.639z" fill="#d30001"/></svg>
+      </header>
+      <article>
+        <p><strong>The change you wanted was rejected.</strong> Maybe you tried to change something you didn’t have access to. If you’re the application owner check the logs for more information.</p>
+      </article>
+    </main>
+
+  </body>
 
 </html>
diff --git a/public/500.html b/public/500.html
index 90beade75..d77718c3a 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,68 +1,114 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <title>We're sorry, but something went wrong (500)</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-    .rails-default-error-page {
-      background-color: #EFEFEF;
-      color: #2E2F30;
-      text-align: center;
-      font-family: arial, sans-serif;
-      margin: 0;
-    }
-
-    .rails-default-error-page div.dialog {
-      width: 95%;
-      max-width: 33em;
-      margin: 4em auto 0;
-    }
-
-    .rails-default-error-page div.dialog>div {
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #BBB;
-      border-top: #B00100 solid 4px;
-      border-top-left-radius: 9px;
-      border-top-right-radius: 9px;
-      background-color: white;
-      padding: 7px 12% 0;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-    }
-
-    .rails-default-error-page h1 {
-      font-size: 100%;
-      color: #730E15;
-      line-height: 1.5em;
-    }
-
-    .rails-default-error-page div.dialog>p {
-      margin: 0 0 1em;
-      padding: 1em;
-      background-color: #F7F7F7;
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #999;
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      border-top-color: #DADADA;
-      color: #666;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-    }
-  </style>
-</head>
-
-<body class="rails-default-error-page">
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <div>
-      <h1>We're sorry, but something went wrong.</h1>
-    </div>
-    <p>If you are the application owner check the logs for more information.</p>
-  </div>
-</body>
+<!doctype html>
+
+<html lang="en">
+
+  <head>
+
+    <title>We’re sorry, but something went wrong (500 Internal Server Error)</title>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1, width=device-width">
+    <meta name="robots" content="noindex, nofollow">
+
+    <style>
+
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
+
+      * {
+        margin: 0;
+      }
+
+      html {
+        font-size: 16px;
+      }
+
+      body {
+        background: #FFF;
+        color: #261B23;
+        display: grid;
+        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Aptos, Roboto, "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        font-size: clamp(1rem, 2.5vw, 2rem);
+        -webkit-font-smoothing: antialiased;
+        font-style: normal;
+        font-weight: 400;
+        letter-spacing: -0.0025em;
+        line-height: 1.4;
+        min-height: 100vh;
+        place-items: center;
+        text-rendering: optimizeLegibility;
+        -webkit-text-size-adjust: 100%;
+      }
+
+      a {
+        color: inherit;
+        font-weight: 700;
+        text-decoration: underline;
+        text-underline-offset: 0.0925em;
+      }
+
+      b, strong {
+        font-weight: 700;
+      }
+
+      i, em {
+        font-style: italic;
+      }
+
+      main {
+        display: grid;
+        gap: 1em;
+        padding: 2em;
+        place-items: center;
+        text-align: center;
+      }
+
+      main header {
+        width: min(100%, 12em);
+      }
+
+      main header svg {
+        height: auto;
+        max-width: 100%;
+        width: 100%;
+      }
+
+      main article {
+        width: min(100%, 30em);
+      }
+
+      main article p {
+        font-size: 75%;
+      }
+
+      main article br {
+
+        display: none;
+
+        @media(min-width: 48em) {
+          display: inline;
+        }
+
+      }
+
+    </style>
+
+  </head>
+
+  <body>
+
+    <!-- This file lives in public/500.html -->
+
+    <main>
+      <header>
+        <svg height="172" viewBox="0 0 480 172" width="480" xmlns="http://www.w3.org/2000/svg"><path d="m101.23 93.8427c-8.1103 0-15.4098 3.7849-19.7354 8.3813h-36.2269v-99.21891h103.8143v37.03791h-68.3984v24.8722c5.1366-2.7035 15.1396-5.9477 24.6014-5.9477 35.146 0 56.233 22.7094 56.233 55.4215 0 34.605-23.791 57.315-60.558 57.315-37.8492 0-61.64-22.169-63.8028-55.963h42.9857c1.0814 10.814 9.1919 19.195 21.6281 19.195 11.355 0 19.465-8.381 19.465-20.547 0-11.625-7.299-20.5463-20.006-20.5463zm138.833 77.8613c-40.822 0-64.884-35.146-64.884-85.7015 0-50.5554 24.062-85.700907 64.884-85.700907 40.823 0 64.884 35.145507 64.884 85.700907 0 50.5555-24.061 85.7015-64.884 85.7015zm0-133.2831c-17.572 0-22.709 21.8984-22.709 47.5816 0 25.6835 5.137 47.5815 22.709 47.5815 17.303 0 22.71-21.898 22.71-47.5815 0-25.6832-5.407-47.5816-22.71-47.5816zm140.456 133.2831c-40.823 0-64.884-35.146-64.884-85.7015 0-50.5554 24.061-85.700907 64.884-85.700907 40.822 0 64.884 35.145507 64.884 85.700907 0 50.5555-24.062 85.7015-64.884 85.7015zm0-133.2831c-17.573 0-22.71 21.8984-22.71 47.5816 0 25.6835 5.137 47.5815 22.71 47.5815 17.302 0 22.709-21.898 22.709-47.5815 0-25.6832-5.407-47.5816-22.709-47.5816z" fill="#f0eff0"/><path d="m23.1377 68.9967v34.0033h-8.9162v-34.0033zm4.3157 34.0033v-24.921h8.6947v2.1598c1.3845-1.5506 3.8212-2.7136 6.701-2.7136 5.538 0 8.8054 3.5997 8.8054 9.1377v16.3371h-8.6393v-14.2327c0-2.049-1.0522-3.5443-3.2674-3.5443-1.7168 0-3.1567.9969-3.5997 2.7136v15.0634zm29.9913-8.5839v-9.5807h-3.655v-6.7564h3.655v-6.8671h8.5839v6.8671h5.2058v6.7564h-5.2058v8.307c0 1.9383.9415 2.769 2.6583 2.769.9414 0 1.9937-.2216 2.769-.5538v7.3654c-.9969.443-2.8798.775-4.8181.775-5.8703 0-9.1931-2.769-9.1931-9.0819zm32.3666-.1108h8.0301c-.8861 5.7597-5.2057 9.2487-11.6852 9.2487-7.6424 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.3165-13.0143 12.5159-13.0143 7.6424 0 11.9621 5.095 11.9621 12.5159v2.1598h-16.1156c.2769 2.9905 1.8275 4.5965 4.3196 4.5965 1.7722 0 3.1567-.7753 3.6551-2.4921zm-3.8212-10.0237c-2.0491 0-3.4336 1.2737-3.9874 3.5997h7.5317c-.1107-2.0491-1.3845-3.5997-3.5443-3.5997zm31.4299-6.3134v8.3624c-1.052-.5538-2.215-.7753-3.599-.7753-2.382 0-3.988 1.0522-4.431 2.8244v14.6203h-8.694v-24.921h8.694v2.2152c1.219-1.6614 3.157-2.769 5.649-2.769 1.108 0 1.994.2215 2.381.443zm2.949 25.0318v-24.921h8.694v2.1598c1.385-1.5506 3.821-2.7136 6.701-2.7136 5.538 0 8.806 3.5997 8.806 9.1377v16.3371h-8.64v-14.2327c0-2.049-1.052-3.5443-3.267-3.5443-1.717 0-3.157.9969-3.6 2.7136v15.0634zm50.371 0h-8.363v-1.274c-.83.831-3.323 1.717-5.981 1.717-4.929 0-9.082-2.769-9.082-8.0301 0-4.818 4.153-7.9193 9.581-7.9193 2.049 0 4.485.6646 5.482 1.3845v-1.606c0-1.606-.941-2.9905-3.046-2.9905-1.606 0-2.547.7199-2.935 1.8275h-8.196c.72-4.8181 4.984-8.6393 11.408-8.6393 7.089 0 11.132 3.7659 11.132 10.2453zm-8.363-6.9779v-1.4399c-.554-1.0522-2.049-1.7167-3.655-1.7167-1.717 0-3.433.7199-3.433 2.3813 0 1.7168 1.716 2.4367 3.433 2.4367 1.606 0 3.101-.6645 3.655-1.6614zm20.742-29.0191v35.997h-8.694v-35.997zm13.036 25.9178h9.248c.72 2.326 2.714 3.489 5.483 3.489 2.713 0 4.596-1.163 4.596-3.2674 0-1.6061-1.052-2.326-3.212-2.8244l-6.534-1.3845c-4.985-1.1076-8.751-3.7105-8.751-9.47 0-6.6456 5.538-11.0206 13.07-11.0206 8.307 0 13.014 4.5411 13.956 10.4114h-8.695c-.72-1.8829-2.27-3.3228-5.205-3.3228-2.548 0-4.265 1.1076-4.265 2.9905 0 1.4953 1.052 2.326 2.825 2.7137l6.645 1.5506c5.815 1.3845 9.027 4.5412 9.027 9.8023 0 6.9778-5.87 10.9654-13.291 10.9654-8.141 0-13.679-3.9322-14.897-10.6332zm46.509 1.3845h8.031c-.887 5.7597-5.206 9.2487-11.686 9.2487-7.642 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.317-13.0143 12.516-13.0143 7.643 0 11.962 5.095 11.962 12.5159v2.1598h-16.115c.277 2.9905 1.827 4.5965 4.319 4.5965 1.773 0 3.157-.7753 3.655-2.4921zm-3.821-10.0237c-2.049 0-3.433 1.2737-3.987 3.5997h7.532c-.111-2.0491-1.385-3.5997-3.545-3.5997zm31.431-6.3134v8.3624c-1.053-.5538-2.216-.7753-3.6-.7753-2.381 0-3.988 1.0522-4.431 2.8244v14.6203h-8.694v-24.921h8.694v2.2152c1.219-1.6614 3.157-2.769 5.649-2.769 1.108 0 1.994.2215 2.382.443zm18.288 25.0318h-7.809l-9.47-24.921h8.861l4.763 14.288 4.652-14.288h8.528zm25.614-8.6947h8.03c-.886 5.7597-5.206 9.2487-11.685 9.2487-7.642 0-12.682-5.2613-12.682-13.0145 0-7.6978 5.316-13.0143 12.516-13.0143 7.642 0 11.962 5.095 11.962 12.5159v2.1598h-16.116c.277 2.9905 1.828 4.5965 4.32 4.5965 1.772 0 3.157-.7753 3.655-2.4921zm-3.821-10.0237c-2.049 0-3.434 1.2737-3.988 3.5997h7.532c-.111-2.0491-1.384-3.5997-3.544-3.5997zm31.43-6.3134v8.3624c-1.052-.5538-2.215-.7753-3.6-.7753-2.381 0-3.987 1.0522-4.43 2.8244v14.6203h-8.695v-24.921h8.695v2.2152c1.218-1.6614 3.157-2.769 5.649-2.769 1.107 0 1.993.2215 2.381.443zm13.703-8.9715h24.312v7.6424h-15.562v5.3165h14.232v7.4763h-14.232v5.8703h15.562v7.6978h-24.312zm44.667 8.9715v8.3624c-1.052-.5538-2.215-.7753-3.6-.7753-2.381 0-3.987 1.0522-4.43 2.8244v14.6203h-8.695v-24.921h8.695v2.2152c1.218-1.6614 3.156-2.769 5.648-2.769 1.108 0 1.994.2215 2.382.443zm19.673 0v8.3624c-1.053-.5538-2.216-.7753-3.6-.7753-2.381 0-3.987 1.0522-4.43 2.8244v14.6203h-8.695v-24.921h8.695v2.2152c1.218-1.6614 3.156-2.769 5.648-2.769 1.108 0 1.994.2215 2.382.443zm26.769 12.5713c0 7.6978-5.15 13.0145-12.737 13.0145-7.532 0-12.738-5.3167-12.738-13.0145s5.206-13.0143 12.738-13.0143c7.587 0 12.737 5.3165 12.737 13.0143zm-8.529 0c0-3.4336-1.495-5.8703-4.208-5.8703-2.659 0-4.154 2.4367-4.154 5.8703s1.495 5.8149 4.154 5.8149c2.713 0 4.208-2.3813 4.208-5.8149zm28.082-12.5713v8.3624c-1.052-.5538-2.215-.7753-3.6-.7753-2.381 0-3.987 1.0522-4.43 2.8244v14.6203h-8.695v-24.921h8.695v2.2152c1.218-1.6614 3.157-2.769 5.649-2.769 1.107 0 1.993.2215 2.381.443z" fill="#d30001"/></svg>
+      </header>
+      <article>
+        <p><strong>We’re sorry, but something went wrong.</strong><br> If you’re the application owner check the logs for more information.</p>
+      </article>
+    </main>
+
+  </body>
 
 </html>
diff --git a/spec/controllers/api/taxon_concepts_controller_spec.rb b/spec/controllers/api/taxon_concepts_controller_spec.rb
index 020da670f..7ba8bca1e 100644
--- a/spec/controllers/api/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/api/taxon_concepts_controller_spec.rb
@@ -124,7 +124,6 @@
           'distribution_references' => [],
           'name_status' => 'A',
           'nomenclature_note_en' => nil,
-          'nomenclature_notification' => false,
           'cites_listing' => nil,
           'eu_listing' => nil,
           'accepted_names' => [],
diff --git a/spec/serializers/show_taxon_concept_serializer_spec.rb b/spec/serializers/show_taxon_concept_serializer_spec.rb
index ceab6ee2c..39f1add94 100644
--- a/spec/serializers/show_taxon_concept_serializer_spec.rb
+++ b/spec/serializers/show_taxon_concept_serializer_spec.rb
@@ -1,90 +1,5 @@
 require 'spec_helper'
 
 describe Species::ShowTaxonConceptSerializer do
-  # At the moment, we need to change the starting date of nomenclature_notification every time
-  pending 'when species is output of recent nomenclature changes' do
-    let(:species) { create_cites_eu_species }
-    let(:nomenclature_change) do
-      create(
-        :nomenclature_change,
-        status: 'submitted',
-        created_at: 5.months.ago
-      )
-    end
-    let!(:output) do
-      create(
-        :nomenclature_change_output,
-        nomenclature_change_id: nomenclature_change.id,
-        taxon_concept_id: species.id
-      )
-    end
-    specify do
-      expect(described_class.new(species).nomenclature_notification).to eq(true)
-    end
-  end
-  pending 'when new species is output of recent nomenclature changes' do
-    let(:species) { create_cites_eu_species }
-    let(:nomenclature_change) do
-      create(
-        :nomenclature_change,
-        status: 'submitted',
-        created_at: 5.months.ago
-      )
-    end
-    let!(:output) do
-      create(
-        :nomenclature_change_output,
-        nomenclature_change_id: nomenclature_change.id,
-        new_taxon_concept_id: species.id
-      )
-    end
-    specify do
-      expect(described_class.new(species).nomenclature_notification).to eq(true)
-    end
-  end
-  context 'when species is output of old nomenclature changes' do
-    let(:species) { create_cites_eu_species }
-    let(:nomenclature_change) do
-      create(
-        :nomenclature_change,
-        status: 'submitted',
-        created_at: 7.months.ago
-      )
-    end
-    let!(:output) do
-      create(
-        :nomenclature_change_output,
-        nomenclature_change_id: nomenclature_change.id,
-        taxon_concept_id: species.id
-      )
-    end
-    specify do
-      expect(described_class.new(species).nomenclature_notification).to eq(false)
-    end
-  end
-  context 'when species is not output of nomenclature changes' do
-    let(:species) { create_cites_eu_species }
-    specify do
-      expect(described_class.new(species).nomenclature_notification).to eq(false)
-    end
-  end
-  context 'when nomenclature changes is not yet submitted' do
-    let(:species) { create_cites_eu_species }
-    let(:nomenclature_change) do
-      create(
-        :nomenclature_change,
-        created_at: 5.months.ago
-      )
-    end
-    let!(:output) do
-      create(
-        :nomenclature_change_output,
-        nomenclature_change_id: nomenclature_change.id,
-        taxon_concept_id: species.id
-      )
-    end
-    specify do
-      expect(described_class.new(species).nomenclature_notification).to eq(false)
-    end
-  end
+  # This used to test the method nomenclature_notification which no longer exists
 end
diff --git a/spec/services/species/common_names_export_spec.rb b/spec/services/species/common_names_export_spec.rb
index 32466886d..acb01d1d4 100644
--- a/spec/services/species/common_names_export_spec.rb
+++ b/spec/services/species/common_names_export_spec.rb
@@ -4,40 +4,57 @@
     subject do
       Species::CommonNamesExport.new({})
     end
-    specify { expect(subject.path).to eq('public/downloads/common_names/') }
+
+    specify do
+      expect(subject.path).to eq('public/downloads/common_names/')
+    end
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::CommonNamesExport.new({})
       end
-      specify { expect(subject.export).to be_falsey }
+
+      specify do
+        expect(subject.export).to be_falsey
+      end
     end
+
     context 'when results' do
       before(:each) do
-        species = create_cites_eu_species
+        create_cites_eu_species
+
         FileUtils.mkpath(
           File.expand_path('spec/public/downloads/common_names')
         )
+
         allow_any_instance_of(Species::CommonNamesExport).to receive(:path).
           and_return('spec/public/downloads/common_names/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/common_names', true)
       end
+
       subject do
         Species::CommonNamesExport.new({})
       end
+
       context 'when file not cached' do
         specify do
           subject.export
+
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
+
           expect(subject).not_to receive(:to_csv)
+
           subject.export
         end
       end
diff --git a/spec/services/species/documents_export_spec.rb b/spec/services/species/documents_export_spec.rb
index eda298ce6..2269105be 100644
--- a/spec/services/species/documents_export_spec.rb
+++ b/spec/services/species/documents_export_spec.rb
@@ -4,10 +4,15 @@
     subject do
       Species::DocumentsExport.new({})
     end
-    specify { expect(subject.path).to eq('public/downloads/documents/') }
+
+    specify do
+      expect(subject.path).to eq('public/downloads/documents/')
+    end
   end
+
   SPEC_DOCUMENTS_DOWNLOAD_PATH = 'spec/public/downloads/documents'
-  describe :export do
+
+  describe :export, cache: true do
     before(:each) do
       FileUtils.mkpath(
         File.expand_path("#{SPEC_DOCUMENTS_DOWNLOAD_PATH}")
@@ -15,20 +20,25 @@
       allow_any_instance_of(Species::DocumentsExport).to receive(:path).
         and_return("#{SPEC_DOCUMENTS_DOWNLOAD_PATH}/")
     end
+
     after(:each) do
       FileUtils.remove_dir("#{SPEC_DOCUMENTS_DOWNLOAD_PATH}", true)
     end
+
     context 'when no results' do
       before(:each) do
         FileUtils.rm_rf(Dir.glob("#{SPEC_DOCUMENTS_DOWNLOAD_PATH}/*"))
       end
+
       subject do
         Species::DocumentsExport.new({})
       end
+
       specify 'when file not cached it should not be generated' do
         expect(subject.export).to be_falsey
       end
     end
+
     context 'when results' do
       # Commented as was causing issues and tests are pending anyway
       # before(:each) {
@@ -43,6 +53,7 @@
         expect(File.file?(subject.file_name)).to be_truthy
         expect(File.size(subject.file_name)).to be > 0
       end
+
       pending 'when file cached it should not be generated' do
         FileUtils.touch(subject.file_name)
         expect(subject).not_to receive(:to_csv)
diff --git a/spec/services/species/hybrid_prefix_matcher_spec.rb b/spec/services/species/hybrid_prefix_matcher_spec.rb
index 662e0e569..8d8fca45a 100644
--- a/spec/services/species/hybrid_prefix_matcher_spec.rb
+++ b/spec/services/species/hybrid_prefix_matcher_spec.rb
@@ -13,8 +13,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@hybrid_ac) }
       end
+
       context 'when trade internal visibility' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -25,8 +27,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@hybrid_ac) }
       end
+
       context 'when speciesplus visibility' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -36,6 +40,7 @@
             }
           )
         end
+
         specify { expect(subject.results).to be_empty }
       end
     end
diff --git a/spec/services/species/listings_export_spec.rb b/spec/services/species/listings_export_spec.rb
index 54bc44562..dc7ada10f 100644
--- a/spec/services/species/listings_export_spec.rb
+++ b/spec/services/species/listings_export_spec.rb
@@ -9,9 +9,11 @@
         }
       )
     end
+
     specify { expect(subject.path).to eq('public/downloads/cites_listings/') }
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::ListingsExportFactory.new(
@@ -22,8 +24,10 @@
           }
         )
       end
+
       specify { expect(subject.export).to be_falsey }
     end
+
     context 'when results' do
       before(:each) do
         FileUtils.mkpath(
@@ -32,9 +36,11 @@
         allow_any_instance_of(Species::ListingsExport).to receive(:path).
           and_return('spec/public/downloads/cites_listings/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/cites_listings', true)
       end
+
       subject do
         Species::ListingsExportFactory.new(
           {
@@ -44,12 +50,14 @@
           }
         )
       end
+
       context 'when file not cached' do
         specify do
           subject.export
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
@@ -59,6 +67,7 @@
       end
     end
   end
+
   describe :query do
     context 'when CITES' do
       context 'when Appendix I' do
@@ -70,6 +79,7 @@
             }
           )
         end
+
         specify { expect(subject.query.to_a.size).to eq(1) }
 
         context 'when Poland' do
@@ -82,6 +92,7 @@
               }
             )
           end
+
           specify { expect(subject.query.to_a.size).to eq(0) }
         end
 
@@ -95,9 +106,11 @@
               }
             )
           end
+
           specify { expect(subject.query.to_a.size).to eq(1) }
         end
       end
+
       context 'when higher taxon ids' do
         subject do
           Species::ListingsExportFactory.new(
@@ -107,8 +120,10 @@
             }
           )
         end
+
         specify { expect(subject.query.to_a.size).to eq(1) }
       end
+
       context 'when implicitly listed subspecies present' do
         before(:each) do
           create_cites_eu_subspecies(
@@ -116,6 +131,7 @@
           )
           SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         end
+
         subject do
           Species::ListingsExportFactory.new(
             {
@@ -124,9 +140,11 @@
             }
           )
         end
+
         specify { expect(subject.query.to_a.size).to eq(1) }
       end
     end
+
     context 'when EU' do
       context 'when Annex A' do
         subject do
@@ -137,6 +155,7 @@
             }
           )
         end
+
         specify { expect(subject.query.to_a.size).to eq(1) }
 
         context 'when Spain' do
@@ -149,6 +168,7 @@
               }
             )
           end
+
           specify { expect(subject.query.to_a.size).to eq(0) }
         end
 
@@ -162,9 +182,11 @@
               }
             )
           end
+
           specify { expect(subject.query.to_a.size).to eq(1) }
         end
       end
+
       context 'when higher taxon ids' do
         subject do
           Species::ListingsExportFactory.new(
@@ -174,6 +196,7 @@
             }
           )
         end
+
         specify { expect(subject.query.to_a.size).to eq(1) }
       end
     end
diff --git a/spec/services/species/orphaned_taxon_concepts_export_spec.rb b/spec/services/species/orphaned_taxon_concepts_export_spec.rb
index a6bee4cb6..bf1f3833b 100644
--- a/spec/services/species/orphaned_taxon_concepts_export_spec.rb
+++ b/spec/services/species/orphaned_taxon_concepts_export_spec.rb
@@ -4,41 +4,55 @@
     subject do
       Species::OrphanedTaxonConceptsExport.new({})
     end
+
     specify { expect(subject.path).to eq('public/downloads/orphaned_taxon_concepts/') }
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::OrphanedTaxonConceptsExport.new({})
       end
+
       specify { expect(subject.export).to be_falsey }
     end
+
     context 'when results' do
       before(:each) do
         tc = create(:taxon_concept)
+
         tc.update_attribute(:parent_id, nil) # skipping validations
+
         FileUtils.mkpath(
           File.expand_path('spec/public/downloads/orphaned_taxon_concepts')
         )
+
         allow_any_instance_of(Species::OrphanedTaxonConceptsExport).to receive(:path).
           and_return('spec/public/downloads/orphaned_taxon_concepts/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/orphaned_taxon_concepts', true)
       end
+
       subject do
         Species::OrphanedTaxonConceptsExport.new({})
       end
+
       context 'when file not cached' do
         specify do
           subject.export
+
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
+
           expect(subject).not_to receive(:to_csv)
+
           subject.export
         end
       end
diff --git a/spec/services/species/search_spec.rb b/spec/services/species/search_spec.rb
index 90b680057..94c9f21af 100644
--- a/spec/services/species/search_spec.rb
+++ b/spec/services/species/search_spec.rb
@@ -1,20 +1,24 @@
 require 'spec_helper'
 describe Species::Search do
   include_context 'Canis lupus'
+
   describe :results do
     context 'when searching by scientific name' do
       context 'when regular query' do
         subject { Species::Search.new({ taxon_concept_query: 'canis' }).results }
         specify { expect(subject).to include(@species) }
       end
+
       context 'when malicious query' do
         subject { Species::Search.new({ taxon_concept_query: 'canis\'' }).results }
         specify { expect(subject).to be_empty }
       end
+
       context 'when leading whitespace' do
         subject { Species::Search.new({ taxon_concept_query: ' canis' }).results }
         specify { expect(subject).to include(@species) }
       end
+
       context 'when trailing whitespace' do
         subject { Species::Search.new({ taxon_concept_query: 'canis ' }).results }
         specify { expect(subject).to include(@species) }
diff --git a/spec/services/species/species_reference_output_spec.rb b/spec/services/species/species_reference_output_spec.rb
index 3f133ffe7..0a812a1e8 100644
--- a/spec/services/species/species_reference_output_spec.rb
+++ b/spec/services/species/species_reference_output_spec.rb
@@ -4,40 +4,53 @@
     subject do
       Species::SpeciesReferenceOutputExport.new({})
     end
+
     specify { expect(subject.path).to eq('public/downloads/species_reference_output/') }
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::SpeciesReferenceOutputExport.new({})
       end
+
       specify { expect(subject.export).to be_falsey }
     end
+
     context 'when results' do
       before(:each) do
-        species = create_cites_eu_species
+        create_cites_eu_species
+
         FileUtils.mkpath(
           File.expand_path('spec/public/downloads/species_reference_output')
         )
+
         allow_any_instance_of(Species::SpeciesReferenceOutputExport).to receive(:path).
           and_return('spec/public/downloads/species_reference_output/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/species_reference_output', true)
       end
+
       subject do
         Species::SpeciesReferenceOutputExport.new({})
       end
+
       context 'when file not cached' do
         specify do
           subject.export
+
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
+
           expect(subject).not_to receive(:to_csv)
+
           subject.export
         end
       end
diff --git a/spec/services/species/standard_reference_output_spec.rb b/spec/services/species/standard_reference_output_spec.rb
index 5fa7898de..1b916875f 100644
--- a/spec/services/species/standard_reference_output_spec.rb
+++ b/spec/services/species/standard_reference_output_spec.rb
@@ -4,40 +4,53 @@
     subject do
       Species::StandardReferenceOutputExport.new({})
     end
+
     specify { expect(subject.path).to eq('public/downloads/standard_reference_output/') }
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::StandardReferenceOutputExport.new({})
       end
+
       specify { expect(subject.export).to be_falsey }
     end
+
     context 'when results' do
       before(:each) do
-        species = create_cites_eu_species
+        create_cites_eu_species
+
         FileUtils.mkpath(
           File.expand_path('spec/public/downloads/standard_reference_output')
         )
+
         allow_any_instance_of(Species::StandardReferenceOutputExport).to receive(:path).
           and_return('spec/public/downloads/standard_reference_output/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/standard_reference_output', true)
       end
+
       subject do
         Species::StandardReferenceOutputExport.new({})
       end
+
       context 'when file not cached' do
         specify do
           subject.export
+
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
+
           expect(subject).not_to receive(:to_csv)
+
           subject.export
         end
       end
diff --git a/spec/services/species/synonyms_and_trade_names_export_spec.rb b/spec/services/species/synonyms_and_trade_names_export_spec.rb
index 8f41f07b5..5e815ab1c 100644
--- a/spec/services/species/synonyms_and_trade_names_export_spec.rb
+++ b/spec/services/species/synonyms_and_trade_names_export_spec.rb
@@ -4,15 +4,19 @@
     subject do
       Species::SynonymsAndTradeNamesExport.new({})
     end
+
     specify { expect(subject.path).to eq('public/downloads/synonyms_and_trade_names/') }
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::SynonymsAndTradeNamesExport.new({})
       end
+
       specify { expect(subject.export).to be_falsey }
     end
+
     context 'when results' do
       before(:each) do
         species = create_cites_eu_species
@@ -29,18 +33,22 @@
         allow_any_instance_of(Species::SynonymsAndTradeNamesExport).to receive(:path).
           and_return('spec/public/downloads/synonyms_and_trade_names/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/synonyms_and_trade_names', true)
       end
+
       subject do
         Species::SynonymsAndTradeNamesExport.new({})
       end
+
       context 'when file not cached' do
         specify do
           subject.export
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
diff --git a/spec/services/species/taxon_concept_prefix_matcher_spec.rb b/spec/services/species/taxon_concept_prefix_matcher_spec.rb
index 663fb7179..60f6f8765 100644
--- a/spec/services/species/taxon_concept_prefix_matcher_spec.rb
+++ b/spec/services/species/taxon_concept_prefix_matcher_spec.rb
@@ -12,8 +12,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@species_ac) }
       end
+
       context 'when searching by hyphenated common name without hyphens' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -23,8 +25,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@species_ac) }
       end
+
       context 'when searching by part of hyphenated common name' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -34,9 +38,11 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@species_ac) }
       end
     end
+
     context 'when searching by scientific name' do
       context 'when regular query' do
         subject do
@@ -47,8 +53,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@species_ac) }
       end
+
       context 'when malicious query' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -58,8 +66,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to be_empty }
       end
+
       context 'when leading whitespace' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -69,8 +79,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@species_ac) }
       end
+
       context 'when trailing whitespace' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -80,8 +92,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@species_ac) }
       end
+
       context 'when implicitly listed subspecies' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -91,8 +105,10 @@
             }
           )
         end
+
         specify { expect(subject.results).not_to include(@subspecies2_ac) }
       end
+
       context 'when explicitly listed subspecies' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -102,8 +118,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@subspecies1_ac) }
       end
+
       context 'when implicitly listed higher taxon (without an explicitly listed ancestor)' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -113,8 +131,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@order_ac) }
       end
+
       context 'when explicitly listed higher taxon' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -124,6 +144,7 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@family_ac) }
       end
       # check ranks filtering
@@ -137,8 +158,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@family_ac) }
       end
+
       context 'when explicitly listed higher taxon but ranks expected SPECIES' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -149,8 +172,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to be_empty }
       end
+
       context 'when searching for name that matches Species and Subspecies but  ranks expected SUBSPECIES' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -161,6 +186,7 @@
             }
           )
         end
+
         specify do
           expect(subject.results).not_to include(@species_ac)
           expect(subject.results).to include(@subspecies1_ac)
diff --git a/spec/services/species/taxon_concepts_export_spec.rb b/spec/services/species/taxon_concepts_export_spec.rb
index 0947da1bf..7b1002e61 100644
--- a/spec/services/species/taxon_concepts_export_spec.rb
+++ b/spec/services/species/taxon_concepts_export_spec.rb
@@ -4,15 +4,19 @@
     subject do
       Species::TaxonConceptsNamesExport.new({})
     end
+
     specify { expect(subject.path).to eq('public/downloads/taxon_concepts_names/') }
   end
-  describe :export do
+
+  describe :export, cache: true do
     context 'when no results' do
       subject do
         Species::TaxonConceptsNamesExport.new({})
       end
+
       specify { expect(subject.export).to be_falsey }
     end
+
     context 'when results' do
       before(:each) do
         create(:taxon_concept)
@@ -22,18 +26,22 @@
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:path).
           and_return('spec/public/downloads/taxon_concepts_names/')
       end
+
       after(:each) do
         FileUtils.remove_dir('spec/public/downloads/taxon_concepts_names', true)
       end
+
       subject do
         Species::TaxonConceptsNamesExport.new({})
       end
+
       context 'when file not cached' do
         specify do
           subject.export
           expect(File.file?(subject.file_name)).to be_truthy
         end
       end
+
       context 'when file cached' do
         specify do
           FileUtils.touch(subject.file_name)
diff --git a/spec/services/species/trade_name_prefix_matcher_spec.rb b/spec/services/species/trade_name_prefix_matcher_spec.rb
index 1e6d753ab..ccbdefe2c 100644
--- a/spec/services/species/trade_name_prefix_matcher_spec.rb
+++ b/spec/services/species/trade_name_prefix_matcher_spec.rb
@@ -4,10 +4,12 @@
     @accepted_name = create_cites_eu_genus(
       taxon_name: create(:taxon_name, scientific_name: 'Pavona')
     )
+
     @trade_name = create_cites_eu_species(
       taxon_name: create(:taxon_name, scientific_name: 'Pavona minor'),
       name_status: 'T'
     )
+
     @status_N_species = create_cites_eu_species(
       taxon_name: create(:taxon_name, scientific_name: 'Paradisaea'),
       parent: create_cites_eu_genus(
@@ -15,18 +17,23 @@
       ),
       name_status: 'N'
     )
+
     create(
       :taxon_relationship,
       taxon_concept: @accepted_name,
       other_taxon_concept: @trade_name,
       taxon_relationship_type: trade_name_relationship_type
     )
+
     create_cites_I_addition(taxon_concept: @accepted_name)
+
     SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
+
     @accepted_name_ac = MAutoCompleteTaxonConcept.find(@accepted_name.id)
     @trade_name_ac = MAutoCompleteTaxonConcept.find(@trade_name.id)
     @status_N_species_ac = MAutoCompleteTaxonConcept.find(@status_N_species.id)
   end
+
   describe :results do
     context 'when searching for status N species' do
       context 'when trade visibility' do
@@ -39,8 +46,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@status_N_species_ac) }
       end
+
       context 'when trade internal visibility' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -51,8 +60,10 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@status_N_species_ac) }
       end
+
       context 'when speciesplus visibility' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -62,9 +73,11 @@
             }
           )
         end
+
         specify { expect(subject.results).not_to include(@status_N_species_ac) }
       end
     end
+
     context 'when searching for trade name' do
       context 'when trade visibility' do
         subject do
@@ -76,9 +89,11 @@
             }
           )
         end
+
         specify { expect(subject.results).not_to include(@trade_name_ac) }
         specify { expect(subject.results).to include(@accepted_name_ac) }
       end
+
       context 'when trade internal visibility' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -89,9 +104,11 @@
             }
           )
         end
+
         specify { expect(subject.results).to include(@trade_name_ac) }
         specify { expect(subject.results).to include(@accepted_name_ac) }
       end
+
       context 'when speciesplus visibility' do
         subject do
           Species::TaxonConceptPrefixMatcher.new(
@@ -101,6 +118,7 @@
             }
           )
         end
+
         specify { expect(subject.results).not_to include(@trade_name_ac) }
         specify { expect(subject.results).to include(@accepted_name_ac) }
       end
diff --git a/spec/services/taxon_concept_prefix_matcher_spec.rb b/spec/services/taxon_concept_prefix_matcher_spec.rb
index 0d0762b45..2ad678631 100644
--- a/spec/services/taxon_concept_prefix_matcher_spec.rb
+++ b/spec/services/taxon_concept_prefix_matcher_spec.rb
@@ -8,12 +8,14 @@
       taxon_name: create(:taxon_name, scientific_name: 'Aaa')
     )
   end
+
   let!(:taxon_concept2) do
     create_cites_eu_family(
       taxon_name: create(:taxon_name, scientific_name: 'Aac'),
       parent: taxon_concept1
     )
   end
+
   let!(:taxon_concept3) do
     create_cites_eu_subfamily(
       taxon_name: create(:taxon_name, scientific_name: 'Aab'),
@@ -32,23 +34,28 @@
       parent: taxon_concept3
     )
   end
+
   let!(:hybrid) do
-    tmp = create_cites_eu_genus(
+    hybrid_genus = create_cites_eu_genus(
       taxon_name: create(:taxon_name, scientific_name: 'Abc'),
       name_status: 'H'
     )
+
     create(
       :taxon_relationship,
       taxon_concept: taxon_concept4,
-      other_taxon_concept: tmp,
+      other_taxon_concept: hybrid_genus,
       taxon_relationship_type: hybrid_relationship_type
     )
-    tmp
+
+    hybrid_genus
   end
+
   context 'when name status not specified' do
     let(:matcher_params) do
       SearchParams.new(taxonomy: { id: taxonomy.id }, scientific_name: 'Ab')
     end
+
     let(:matcher) { TaxonConceptPrefixMatcher.new matcher_params }
     specify { expect(matcher.taxon_concepts).to include(taxon_concept4) }
     specify { expect(matcher.taxon_concepts).not_to include(hybrid) }
@@ -58,7 +65,9 @@
     let(:matcher_params) do
       SearchParams.new(taxonomy: { id: taxonomy.id }, scientific_name: 'Ab', name_status: 'H')
     end
+
     let(:matcher) { TaxonConceptPrefixMatcher.new matcher_params }
+
     specify { expect(matcher.taxon_concepts).not_to include(taxon_concept4) }
     specify { expect(matcher.taxon_concepts).to include(hybrid) }
   end
@@ -71,6 +80,7 @@
         scientific_name: 'A'
       )
     end
+
     let(:parent_matcher) do
       TaxonConceptPrefixMatcher.new parent_matcher_params
     end
@@ -88,6 +98,7 @@
         scientific_name: 'AAA'
       )
     end
+
     let(:ancestor_matcher) do
       TaxonConceptPrefixMatcher.new ancestor_matcher_params
     end
@@ -105,6 +116,7 @@
         scientific_name: 'AAA'
       )
     end
+
     let(:self_and_ancestor_matcher) do
       TaxonConceptPrefixMatcher.new self_and_ancestor_matcher_params
     end
@@ -140,6 +152,7 @@
         scientific_name: 'A'
       )
     end
+
     let(:descendant_matcher) do
       TaxonConceptPrefixMatcher.new descendant_matcher_params
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 70102c3bd..7c3aa80af 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -103,6 +103,20 @@
       Sidekiq::Testing.fake!
     end
   end
+
+  config.before(:each) do |example|
+    if example.metadata[:cache]
+      memory_store = ActiveSupport::Cache.lookup_store(:memory_store)
+
+      allow(
+        Rails.application.config.action_controller
+      ).to receive(:perform_caching).and_return(true)
+
+      allow(Rails).to receive(:cache).and_return(memory_store)
+
+      Rails.cache.clear
+    end
+  end
 end
 
 def build_attributes(*args)