diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39c1527ecb..aa02b113da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
   build:
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:develop
+      - image: avalonmediasystem/avalon:7.5.0-dev-ruby3
         environment:
           - DATABASE_URL=postgresql://postgres@localhost:5432/postgres
           - FEDORA_URL=http://localhost:8080/fcrepo/rest
@@ -31,7 +31,7 @@ jobs:
     parameters:
       ruby_ver:
         description: 'Ruby version'
-        default: '2.7'
+        default: '3.1'
         type: 'string'
       solr_port:
         type: string
@@ -140,7 +140,7 @@ jobs:
         default: 4
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:develop
+      - image: avalonmediasystem/avalon:7.5.0-dev-ruby3
 
     working_directory: /home/app/avalon
 
@@ -163,10 +163,10 @@ workflows:
   build_test_report:
     jobs:
       - build:
-          ruby_ver: '2.7'
-          name: 'Ruby2-7'
+          ruby_ver: '3.2'
+          name: 'Ruby3-2'
           parallelism: 4
       - upload-coverage:
           parallelism: 4
           requires:
-            - Ruby2-7
+            - Ruby3-2
diff --git a/Dockerfile b/Dockerfile
index 2463a6d1df..2d46bfb7bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Base stage for building gems
-FROM        ruby:2.7-bullseye as bundle
+FROM        ruby:3.2-bullseye as bundle
 LABEL       stage=build
 LABEL       project=avalon
 RUN        apt-get update && apt-get upgrade -y build-essential && apt-get autoremove \
@@ -19,6 +19,9 @@ COPY        Gemfile.lock ./Gemfile.lock
 RUN         gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" \
          && bundle config build.nokogiri --use-system-libraries
 
+ENV         RUBY_THREAD_MACHINE_STACK_SIZE 8388608
+ENV         RUBY_THREAD_VM_STACK_SIZE 8388608
+
 
 # Build development gems
 FROM        bundle as bundle-dev
@@ -30,7 +33,7 @@ RUN         bundle config set --local without 'production' \
 
 
 # Download binaries in parallel
-FROM        ruby:2.7-bullseye as download
+FROM        ruby:3.2-bullseye as download
 LABEL       stage=build
 LABEL       project=avalon
 RUN         curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz | tar xvz -C /usr/bin/
@@ -43,7 +46,7 @@ RUN      apt-get -y update && apt-get install -y ffmpeg
 
 
 # Base stage for building final images
-FROM        ruby:2.7-slim-bullseye as base
+FROM        ruby:3.2-slim-bullseye as base
 LABEL       stage=build
 LABEL       project=avalon
 RUN         echo "deb     http://ftp.us.debian.org/debian/    bullseye main contrib non-free"  >  /etc/apt/sources.list.d/bullseye.list \
diff --git a/Gemfile b/Gemfile
index 0d4ffe2ce3..a6733c68bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,9 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=6.0.6.1'
+gem 'net-smtp', require: false
+gem 'psych', '< 4'
+gem 'rails', '=7.0.4.3'
 gem 'sprockets', '~>3.7.2'
 #gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'sqlite3'
@@ -27,13 +29,13 @@ gem 'uglifier', '>= 1.3.0'
 gem 'webpacker'
 
 # Core Samvera
-gem 'active-fedora', '~> 13.2', '>= 13.2.5'
-gem 'active_fedora-datastreams', '~> 0.4'
+gem 'active-fedora', '~> 14.0', '>= 14.0.1'
+gem 'active_fedora-datastreams', '~> 0.5'
 gem 'hydra-head', '~> 12.0'
-gem 'ldp', '~> 1.0.3'
-gem 'noid-rails', '~> 3.0.1'
+gem 'ldp', '~> 1.1.0'
+gem 'noid-rails', '~> 3.1'
+gem 'om', git: 'https://github.com/avalonmediasystem/om.git', tag: 'v3.2.0-ruby3'
 gem 'rdf-rdfxml'
-gem 'rdf-vocab', '< 3.1.5'
 
 # Samvera version pins
 gem 'blacklight', '~> 7.25'
@@ -51,11 +53,11 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
 #gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
 gem 'bootstrap-toggle-rails'
 gem 'bootstrap_form'
-gem 'iiif_manifest', '~> 0.6'
+gem 'iiif_manifest', '~> 1.3'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
-gem 'samvera-persona', '~> 0.3'
+gem 'samvera-persona', '~> 0.4', '>= 0.4.1'
 gem 'speedy-af', '~> 0.3'
 
 # Avalon Components
@@ -72,18 +74,18 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
 gem "omniauth-saml", "~> 2.0"
 
 # Media Access & Transcoding
-gem 'active_encode', '~> 1.0', '>= 1.1.2'
+gem 'active_encode', '~> 1.0', '>= 1.1.3'
 gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
 gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
 gem 'fastimage'
 gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6.5'
-gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", branch: 'avalon_fixes'
+gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", tag: 'v0.7.1-avalon'
 gem 'rest-client', '~> 2.0'
 gem 'roo'
 gem 'wavefile', '~> 1.0.1'
 
 # Data Translation & Normalization
-gem 'edtf'
+gem 'edtf', '>= 3.1.1'
 gem 'iconv', '~> 1.0.6'
 gem 'marc'
 
@@ -92,7 +94,7 @@ gem 'activejob-traffic_control'
 gem 'activejob-uniqueness'
 gem 'redis-rails'
 gem 'sidekiq', '~> 6.2'
-gem 'sidekiq-cron', '~> 1.2', git: "https://github.com/avalonmediasystem/sidekiq-cron.git", tag: 'v1.2.1-avalon'
+gem 'sidekiq-cron', '~> 1.9'
 
 # Coding Patterns
 gem 'config'
@@ -112,7 +114,6 @@ group :development do
   # Use Bixby instead of rubocop directly
   gem 'bixby', require: false
   gem 'web-console'
-  gem 'xray-rails'
 end
 
 group :development, :test do
@@ -144,7 +145,7 @@ group :test do
   gem 'shoulda-matchers'
   gem 'simplecov'
   gem 'webdrivers', '~> 3.0'
-  gem 'webmock', '~> 3.5.1'
+  gem 'webmock', '~> 3.5'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6fb6a6a090..271d12d1db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,7 +24,7 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/browse-everything.git
-  revision: 38610d19d36105ca9c311e0a641fdb43697fabea
+  revision: 51ac41d1631eba86b123222d9bfeef342f25ec56
   branch: v1.2-avalon
   specs:
     browse-everything (1.2.0)
@@ -48,11 +48,22 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/mediainfo.git
-  revision: 11504137076169863509c1caaf3555ab65a4a64b
-  branch: avalon_fixes
+  revision: bea9479d33328c6b483ee19c008730f939d98266
+  tag: v0.7.1-avalon
   specs:
     mediainfo (0.7.1)
 
+GIT
+  remote: https://github.com/avalonmediasystem/om.git
+  revision: ffde890b4187a7d8be41ae387264cd6eb20b6ba8
+  tag: v3.2.0-ruby3
+  specs:
+    om (3.2.0)
+      activemodel (>= 5.1)
+      activesupport
+      nokogiri (>= 1.4.2)
+      solrizer (~> 3.3)
+
 GIT
   remote: https://github.com/avalonmediasystem/omniauth-lti.git
   revision: 7534c44fc5a3c927aec57bbd3a15cbad37feec74
@@ -62,65 +73,65 @@ GIT
       ims-lti
       omniauth
 
-GIT
-  remote: https://github.com/avalonmediasystem/sidekiq-cron.git
-  revision: 9bb8c76863aade7849a1a85a1232683e96c41c1f
-  tag: v1.2.1-avalon
-  specs:
-    sidekiq-cron (1.2.1)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.6.1)
-      actionpack (= 6.0.6.1)
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (>= 2.7.1)
-    actionmailer (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6.1)
-      actionview (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active-fedora (13.3.0)
+    active-fedora (14.0.1)
       active-triples (>= 0.11.0, < 2.0.0)
       activemodel (>= 5.1)
       activesupport (>= 5.1)
       deprecation
-      faraday (~> 0.12)
+      faraday (>= 1.0)
       faraday-encoding (>= 0.0.5)
       ldp (>= 0.7.0, < 2)
       rsolr (>= 1.1.2, < 3)
       ruby-progressbar (~> 1.0)
-    active-triples (1.1.1)
+    active-triples (1.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rdf (>= 2.0.2, < 4.0)
@@ -132,117 +143,121 @@ GEM
     active_elastic_job (3.2.0)
       aws-sdk-sqs (~> 1)
       rails (>= 5.2.6, < 7.1)
-    active_encode (1.1.2)
+    active_encode (1.1.3)
       addressable (~> 2.8)
       rails
-    active_fedora-datastreams (0.4.0)
-      active-fedora (>= 11.0.0.pre, < 14)
-      activemodel (< 6.1)
+    active_fedora-datastreams (0.5.0)
+      active-fedora (>= 11.0.0.pre)
+      activemodel (>= 5.2)
       nom-xml (>= 0.5.1)
       om (~> 3.1)
-      rdf (< 3.2)
-      rdf-rdfxml (~> 2.0)
-    activejob (6.0.6.1)
-      activesupport (= 6.0.6.1)
+      rdf (~> 3.2)
+      rdf-rdfxml (~> 3.2)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.3.6)
     activejob-traffic_control (0.1.3)
       activejob (>= 4.2)
       activesupport (>= 4.2)
       suo
-    activejob-uniqueness (0.2.2)
-      activejob (>= 4.2, < 7)
+    activejob-uniqueness (0.2.5)
+      activejob (>= 4.2, < 7.1)
       redlock (>= 1.2, < 2)
-    activemodel (6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activerecord (6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
     activerecord-session_store (2.0.0)
       actionpack (>= 5.2.4.1)
       activerecord (>= 5.2.4.1)
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 3)
       railties (>= 5.2.4.1)
-    activestorage (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       marcel (~> 1.0)
-    activesupport (6.0.6.1)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    acts_as_list (1.0.4)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    acts_as_list (1.1.0)
       activerecord (>= 4.2)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    airbrussh (1.4.0)
+    airbrussh (1.4.1)
       sshkit (>= 1.6.1, != 1.7.0)
-    amazing_print (1.4.0)
     api-pagination (5.0.0)
     ast (2.4.2)
     audio_waveform-ruby (1.0.7)
       json (~> 2.3)
-    autoprefixer-rails (10.4.2.0)
+    autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.602.0)
-    aws-record (2.7.0)
+    aws-partitions (1.735.0)
+    aws-record (2.10.1)
       aws-sdk-dynamodb (~> 1.18)
-    aws-sdk-cloudfront (1.62.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-cloudfront (1.75.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.2)
+    aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-dynamodb (1.72.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-dynamodb (1.81.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elastictranscoder (1.37.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-elastictranscoder (1.40.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.63.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rails (3.6.1)
+    aws-sdk-rails (3.7.0)
       aws-record (~> 2)
       aws-sdk-ses (~> 1)
+      aws-sdk-sesv2 (~> 1)
       aws-sdk-sqs (~> 1)
       aws-sessionstore-dynamodb (~> 2)
       concurrent-ruby (~> 1)
       railties (>= 5.2.0)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.119.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-ses (1.46.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-ses (1.49.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.50.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-sesv2 (1.31.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.53.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sessionstore-dynamodb (2.0.1)
       aws-sdk-dynamodb (~> 1)
       rack (~> 2)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bindex (0.8.1)
-    bixby (3.0.2)
-      rubocop (= 0.85.1)
-      rubocop-ast (~> 0.3.0)
+    bixby (5.0.2)
+      rubocop (= 1.28.2)
+      rubocop-ast
       rubocop-performance
       rubocop-rails
       rubocop-rspec
-    blacklight (7.28.0)
+    blacklight (7.33.1)
       deprecation
       globalid
       hashdiff
@@ -251,46 +266,46 @@ GEM
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
       rails (>= 5.1, < 7.1)
-      view_component (~> 2.43)
+      view_component (~> 2.66)
     blacklight-access_controls (6.0.1)
       blacklight (> 6.0, < 8)
       cancancan (>= 1.8)
       deprecation (~> 1.0)
-    bootsnap (1.10.3)
+    bootsnap (1.16.0)
       msgpack (~> 1.2)
-    bootstrap (4.6.1)
+    bootstrap (4.6.2)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.14.3, < 2)
+      popper_js (>= 1.16.1, < 2)
       sassc-rails (>= 2.0.0)
     bootstrap-toggle-rails (2.2.1.0)
-    bootstrap_form (5.0.0)
+    bootstrap_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     builder (3.2.4)
     byebug (11.1.3)
-    cancancan (3.3.0)
-    capistrano (3.16.0)
+    cancancan (3.4.0)
+    capistrano (3.17.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (2.0.1)
+    capistrano-bundler (2.1.0)
       capistrano (~> 3.1)
     capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
-    capistrano-rails (1.6.1)
+    capistrano-rails (1.6.2)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano-sidekiq (2.0.0)
+    capistrano-sidekiq (2.3.0)
       capistrano (>= 3.9.0)
       capistrano-bundler
       sidekiq (>= 6.0)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (3.36.0)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -311,11 +326,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.0)
-    config (4.0.0)
+    concurrent-ruby (1.2.2)
+    config (4.1.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
-    connection_pool (2.2.5)
+    connection_pool (2.3.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -332,91 +347,92 @@ GEM
     deep_merge (1.2.2)
     deprecation (1.1.0)
       activesupport
-    devise (4.8.1)
+    devise (4.9.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (2.0.6)
+    devise_invitable (2.0.7)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
     dropbox_api (0.1.21)
       faraday (< 3.0)
       oauth2 (~> 1.1)
-    dry-configurable (0.14.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
     dry-initializer (3.1.1)
-    dry-logic (1.2.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.9.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
+      dry-logic (>= 1.5, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.8.0)
+      dry-core (~> 1.0, < 2)
+      dry-inflector (~> 1.0, < 2)
+      dry-logic (>= 1.4, < 2)
+      zeitwerk (~> 2.6)
+    dry-validation (1.10.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.9, >= 1.9.1)
-    ebnf (2.2.1)
-      amazing_print (~> 1.2)
+      dry-schema (>= 1.12, < 2)
+      zeitwerk (~> 2.6)
+    ebnf (2.3.2)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
+      rdf (~> 3.2)
       scanf (~> 1.0)
-      sxp (~> 1.1)
-      unicode-types (~> 1.6)
-    edtf (3.1.0)
+      sxp (~> 1.2)
+      unicode-types (~> 1.8)
+    edtf (3.1.1)
       activesupport (>= 3.0, < 8.0)
-    email_spec (2.2.0)
+    email_spec (2.2.1)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.7)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubi (1.12.0)
-    et-orbi (1.2.6)
+    et-orbi (1.2.7)
       tzinfo
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     execjs (2.8.1)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    fakefs (1.4.1)
-    faker (2.19.0)
-      i18n (>= 1.6, < 2)
-    faraday (0.17.5)
-      multipart-post (>= 1.2, < 3)
+    fakefs (2.2.0)
+    faker (3.1.1)
+      i18n (>= 1.8.11, < 2)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
     faraday-encoding (0.0.5)
       faraday
+    faraday-net_http (3.0.2)
     fastimage (2.2.6)
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
@@ -426,13 +442,13 @@ GEM
       rake
     font-awesome-rails (4.7.0.8)
       railties (>= 3.2, < 8.0)
-    fugit (1.5.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.8.1)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-analytics-rails (1.1.0)
-    google-apis-core (0.7.0)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -441,9 +457,9 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-drive_v3 (0.25.0)
-      google-apis-core (>= 0.7, < 2.a)
-    googleauth (1.2.0)
+    google-apis-drive_v3 (0.37.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    googleauth (1.5.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -453,41 +469,39 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
     hashdiff (1.0.1)
     hashie (5.0.0)
     hooks (0.4.1)
       uber (~> 0.0.14)
     htmlentities (4.3.4)
-    http (5.0.4)
+    http (5.1.1)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.4.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_logger (0.7.0)
     httpclient (2.8.3)
-    hydra-access-controls (12.0.1)
+    hydra-access-controls (12.1.0)
       active-fedora (>= 10.0.0)
-      activesupport (>= 5.2, < 7)
+      activesupport (>= 5.2, < 7.1)
       blacklight-access_controls (~> 6.0)
       cancancan (>= 1.8, < 4)
       deprecation (~> 1.0)
-    hydra-core (12.0.1)
-      hydra-access-controls (= 12.0.1)
-      railties (>= 5.2, < 7)
-    hydra-head (12.0.1)
-      hydra-access-controls (= 12.0.1)
-      hydra-core (= 12.0.1)
-      rails (>= 5.2, < 7)
+    hydra-core (12.1.0)
+      hydra-access-controls (= 12.1.0)
+      railties (>= 5.2, < 7.1)
+    hydra-head (12.1.0)
+      hydra-access-controls (= 12.1.0)
+      hydra-core (= 12.1.0)
+      rails (>= 5.2, < 7.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     iconv (1.0.8)
-    iiif_manifest (0.6.0)
+    iiif_manifest (1.3.1)
       activesupport (>= 4)
     ims-lti (1.1.13)
       builder
@@ -495,24 +509,24 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     jquery-datatables (1.10.20)
-    jquery-rails (4.4.0)
+    jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.6.2)
-    json-canonicalization (0.3.0)
-    json-ld (3.1.10)
+    json (2.6.3)
+    json-canonicalization (0.3.1)
+    json-ld (3.2.3)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
-    jwt (2.4.1)
+      multi_json (~> 1.15)
+      rack (~> 2.2)
+      rdf (~> 3.2, >= 3.2.9)
+    jwt (2.7.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -525,26 +539,27 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    ldp (1.0.3)
+    launchy (2.5.2)
+      addressable (~> 2.8)
+    ldp (1.1.0)
       deprecation
-      faraday
+      faraday (>= 1)
       http_logger
-      json-ld
-      rdf (>= 1.1)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
       rdf-isomorphic
+      rdf-ldp
       rdf-turtle
       rdf-vocab (>= 0.8)
       slop
     link_header (0.0.8)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    lograge (0.11.2)
+    lograge (0.12.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -552,12 +567,12 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.1.rc2)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marc (1.1.1)
+    marc (1.2.0)
       rexml
       scrub_rb (>= 1.0.1, < 2)
       unf
@@ -570,109 +585,105 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.1)
-    minitest (5.17.0)
-    msgpack (1.4.5)
+    minitar (0.9)
+    minitest (5.18.0)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
-    mysql2 (0.5.3)
+    multipart-post (2.3.0)
+    mysql2 (0.5.5)
     net-imap (0.3.4)
       date
       net-protocol
-    net-ldap (0.17.0)
+    net-ldap (0.17.1)
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
     net-smtp (0.3.3)
       net-protocol
-    net-ssh (6.1.0)
+    net-ssh (7.0.1)
     netrc (0.11.0)
     nio4r (2.5.8)
     noid (0.9.0)
-    noid-rails (3.0.3)
-      actionpack (>= 5.0.0, < 7)
+    noid-rails (3.1.0)
+      actionpack (>= 5.0.0, < 7.1)
       noid (~> 0.9)
-    nokogiri (1.14.1)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nom-xml (1.2.0)
       i18n
       nokogiri
-    oauth (0.5.8)
-    oauth2 (1.4.10)
+    oauth (0.5.14)
+    oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     okcomputer (1.18.4)
-    om (3.2.0)
-      activemodel (>= 5.1, < 7)
-      activesupport
-      nokogiri (>= 1.4.2)
-      solrizer (~> 3.3)
-    omniauth (2.0.4)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
     omniauth-identity (3.0.9)
       bcrypt
       omniauth
-    omniauth-saml (2.0.0)
+    omniauth-saml (2.1.0)
       omniauth (~> 2.0)
-      ruby-saml (~> 1.9)
+      ruby-saml (~> 1.12)
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.5.5)
-    parallel (1.21.0)
-    paranoia (2.5.2)
+    parallel (1.22.1)
+    paranoia (2.6.1)
       activerecord (>= 5.1, < 7.1)
-    parser (3.1.0.0)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
-    pg (1.3.2)
-    popper_js (1.16.0)
+    pg (1.4.5)
+    popper_js (1.16.1)
     pretender (0.4.0)
       actionpack (>= 5.2)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (5.0.0)
-    puma (5.6.4)
+    psych (3.3.4)
+    public_suffix (5.0.1)
+    puma (6.0.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.6.2)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (2.2.0)
+    rack-protection (3.0.5)
       rack
-    rack-proxy (0.7.2)
+    rack-proxy (0.7.6)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6.1)
-      actioncable (= 6.0.6.1)
-      actionmailbox (= 6.0.6.1)
-      actionmailer (= 6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actiontext (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6.1)
-      sprockets-rails (>= 2.0.0)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      bundler (>= 1.15.0)
+      railties (= 7.0.4.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -685,53 +696,57 @@ GEM
     rails_same_site_cookie (0.1.9)
       rack (>= 1.5)
       user_agent_parser (~> 2.6)
-    railties (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-readline (0.5.5)
-    rdf (3.1.15)
-      hamster (~> 3.0)
+    rdf (3.2.9)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.1.0)
-      rdf (~> 3.1)
-    rdf-isomorphic (3.1.1)
-      rdf (~> 3.1)
-    rdf-rdfa (3.1.0)
-      haml (~> 5.1)
+    rdf-aggregate-repo (3.2.1)
+      rdf (~> 3.2)
+    rdf-isomorphic (3.2.1)
+      rdf (~> 3.2)
+    rdf-ldp (0.1.0)
+      deprecation
+      rdf
+    rdf-rdfa (3.2.0)
+      haml (~> 5.2)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-rdfxml (2.2.1)
+      rdf (~> 3.2)
+      rdf-aggregate-repo (~> 3.2)
+      rdf-vocab (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-rdfxml (3.2.0)
       htmlentities (~> 4.3)
-      rdf (>= 2.2, < 4.0)
-      rdf-rdfa (>= 2.2, < 4.0)
-      rdf-xsd (>= 2.2, < 4.0)
-    rdf-turtle (3.1.3)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.8)
-    rdf-vocab (3.1.4)
-      rdf (~> 3.1)
-    rdf-xsd (3.1.1)
-      rdf (~> 3.1)
+      rdf (~> 3.2)
+      rdf-rdfa (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-turtle (3.2.1)
+      ebnf (~> 2.3)
+      rdf (~> 3.2)
+    rdf-vocab (3.2.3)
+      rdf (~> 3.2, >= 3.2.4)
+    rdf-xsd (3.2.1)
+      rdf (~> 3.2)
       rexml (~> 3.2)
-    react-rails (2.6.1)
+    react-rails (2.6.2)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
       railties (>= 3.2)
       tilt
-    recaptcha (5.8.1)
+    recaptcha (5.12.3)
       json
-    redis (4.6.0)
+    redis (4.8.1)
     redis-actionpack (5.3.0)
       actionpack (>= 5, < 8)
       redis-rack (>= 2.1.0, < 3)
@@ -748,18 +763,18 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.9.1)
       redis (>= 4, < 5)
-    redlock (1.2.2)
-      redis (>= 3.0.0, < 5.0)
-    regexp_parser (2.2.1)
+    redlock (1.3.2)
+      redis (>= 3.0.0, < 6.0)
+    regexp_parser (2.7.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -767,71 +782,73 @@ GEM
       netrc (~> 0.8)
     retriable (3.1.2)
     rexml (3.2.5)
-    roo (2.8.3)
+    roo (2.10.0)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
     rsolr (2.5.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-rails (5.1.0)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.11)
+      rspec-expectations (~> 3.11)
+      rspec-mocks (~> 3.11)
+      rspec-support (~> 3.11)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.11.0)
-    rspec_junit_formatter (0.5.1)
+    rspec-support (3.12.0)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.85.1)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
-    rubocop-rails (2.6.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.16.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.41.0)
-      rubocop (>= 0.68.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-box (1.15.0)
       addressable
       json
       multipart-post
       oauth2
-    ruby-progressbar (1.11.0)
-    ruby-saml (1.14.0)
-      nokogiri (>= 1.10.5)
+    ruby-progressbar (1.13.0)
+    ruby-saml (1.15.0)
+      nokogiri (>= 1.13.10)
       rexml
+    ruby2_keywords (0.0.5)
     rubyzip (1.3.0)
-    samvera-persona (0.3.0)
+    samvera-persona (0.4.1)
       devise (~> 4.6)
       devise_invitable (>= 1.7, < 3.0)
       paranoia (~> 2.2)
       pretender
-      rails (>= 5.2.4.3, < 6.1)
+      rails (>= 5.2.4.3, < 7.1)
     sass (3.4.22)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -847,29 +864,32 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
-    shoulda-matchers (5.1.0)
+    shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.4.1)
-      connection_pool (>= 2.2.2)
+    sidekiq (6.5.8)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
-      redis (>= 4.2.0)
+      redis (>= 4.5.0, < 5)
+    sidekiq-cron (1.9.1)
+      fugit (~> 1.8)
+      sidekiq (>= 4.2.1)
     signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    slop (4.9.3)
-    solr_wrapper (3.1.2)
+    slop (4.10.1)
+    solr_wrapper (4.0.2)
       http
+      minitar
       retriable
       ruby-progressbar
-      rubyzip
     solrizer (3.4.1)
       activesupport
       daemons
@@ -890,8 +910,9 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    sshkit (1.21.2)
+    sqlite3 (1.6.0)
+      mini_portile2 (~> 2.8.0)
+    sshkit (1.21.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stomp (1.4.10)
@@ -899,13 +920,13 @@ GEM
       dalli
       msgpack
       redis
-    sxp (1.1.0)
-      rdf (~> 3.1)
-    temple (0.8.2)
+    sxp (1.2.3)
+      matrix (~> 0.4)
+      rdf (~> 3.2)
+    temple (0.10.0)
     thor (1.2.1)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    timeout (0.3.1)
+    tilt (2.0.11)
+    timeout (0.3.2)
     trailblazer-option (0.1.2)
     twitter-typeahead-rails (0.11.1.pre.corejavascript)
       actionpack (>= 3.1)
@@ -913,19 +934,20 @@ GEM
       railties (>= 3.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.0.15)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.8.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.4.2)
     unicode-types (1.8.0)
-    user_agent_parser (2.9.0)
-    view_component (2.58.0)
-      activesupport (>= 5.0.0, < 8.0)
+    user_agent_parser (2.14.0)
+    view_component (2.82.0)
+      activesupport (>= 5.2.0, < 8.0)
+      concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -939,16 +961,16 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (~> 3.0)
-    webmock (3.5.1)
-      addressable (>= 2.3.6)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
-      hashdiff
-    webpacker (5.4.3)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webpacker (5.4.4)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -957,12 +979,10 @@ GEM
       rexml
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    xray-rails (0.3.2)
-      rails (>= 3.1.0)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
     zk (1.10.0)
       zookeeper (~> 1.5.0)
-    zookeeper (1.5.1)
+    zookeeper (1.5.5)
     zoom (0.5.0)
 
 PLATFORMS
@@ -970,11 +990,11 @@ PLATFORMS
 
 DEPENDENCIES
   about_page!
-  active-fedora (~> 13.2, >= 13.2.5)
+  active-fedora (~> 14.0, >= 14.0.1)
   active_annotations (~> 0.4)
   active_elastic_job
-  active_encode (~> 1.0, >= 1.1.2)
-  active_fedora-datastreams (~> 0.4)
+  active_encode (~> 1.0, >= 1.1.3)
+  active_fedora-datastreams (~> 0.5)
   activejob-traffic_control
   activejob-uniqueness
   activerecord-session_store (>= 2.0.0)
@@ -1015,7 +1035,7 @@ DEPENDENCIES
   devise (~> 4.8)
   devise_invitable (~> 2.0)
   dotenv-rails
-  edtf
+  edtf (>= 3.1.1)
   email_spec
   equivalent-xml
   factory_bot_rails
@@ -1029,13 +1049,13 @@ DEPENDENCIES
   hooks
   hydra-head (~> 12.0)
   iconv (~> 1.0.6)
-  iiif_manifest (~> 0.6)
+  iiif_manifest (~> 1.3)
   ims-lti (~> 1.1.13)
   jbuilder (~> 2.0)
   jquery-datatables
   jquery-rails
   jquery-ui-rails
-  ldp (~> 1.0.3)
+  ldp (~> 1.1.0)
   listen
   lograge
   mail (> 2.8.0.1)
@@ -1044,8 +1064,10 @@ DEPENDENCIES
   mediainfo!
   mysql2
   net-ldap
-  noid-rails (~> 3.0.1)
+  net-smtp
+  noid-rails (~> 3.1)
   okcomputer
+  om!
   omniauth (~> 2.0)
   omniauth-identity (>= 2.0.0)
   omniauth-lti!
@@ -1054,15 +1076,15 @@ DEPENDENCIES
   pg
   pry-byebug
   pry-rails
+  psych (< 4)
   puma (>= 4.3.8)
   rack-cors
-  rails (= 6.0.6.1)
+  rails (= 7.0.4.3)
   rails-controller-testing
   rails_same_site_cookie
   rb-readline
   rdf (~> 3.1)
   rdf-rdfxml
-  rdf-vocab (< 3.1.5)
   react-rails
   recaptcha
   redis-rails
@@ -1073,12 +1095,12 @@ DEPENDENCIES
   rspec-rails
   rspec-retry
   rspec_junit_formatter
-  samvera-persona (~> 0.3)
+  samvera-persona (~> 0.4, >= 0.4.1)
   sass (= 3.4.22)
   selenium-webdriver
   shoulda-matchers
   sidekiq (~> 6.2)
-  sidekiq-cron (~> 1.2)!
+  sidekiq-cron (~> 1.9)
   simplecov
   solr_wrapper (>= 0.16)
   speedy-af (~> 0.3)
@@ -1090,10 +1112,9 @@ DEPENDENCIES
   wavefile (~> 1.0.1)
   web-console
   webdrivers (~> 3.0)
-  webmock (~> 3.5.1)
+  webmock (~> 3.5)
   webpacker
   with_locking
-  xray-rails
   zk
   zoom
 
diff --git a/LICENSE_HEADER b/LICENSE_HEADER
new file mode 100644
index 0000000000..2cc4fd3914
--- /dev/null
+++ b/LICENSE_HEADER
@@ -0,0 +1,12 @@
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+  University.  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+  under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+  CONDITIONS OF ANY KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations under the License.
diff --git a/app/assets/javascripts/access_control_step.js.coffee b/app/assets/javascripts/access_control_step.js.coffee
index 63b6e00850..7bfe9a1b84 100644
--- a/app/assets/javascripts/access_control_step.js.coffee
+++ b/app/assets/javascripts/access_control_step.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/android_pre_play.js b/app/assets/javascripts/android_pre_play.js
index b1f778a6ce..8184cd7a05 100644
--- a/app/assets/javascripts/android_pre_play.js
+++ b/app/assets/javascripts/android_pre_play.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e7c61499ea..fd14f3b7ee 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/autocomplete.js.coffee b/app/assets/javascripts/autocomplete.js.coffee
index 335f23a4f2..8156236b8b 100644
--- a/app/assets/javascripts/autocomplete.js.coffee
+++ b/app/assets/javascripts/autocomplete.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/avalon.js b/app/assets/javascripts/avalon.js
index f6e4a42b5d..0185f4bd44 100644
--- a/app/assets/javascripts/avalon.js
+++ b/app/assets/javascripts/avalon.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/avalon_playlists/playlist_items.js b/app/assets/javascripts/avalon_playlists/playlist_items.js
index 70788703b7..7737980863 100644
--- a/app/assets/javascripts/avalon_playlists/playlist_items.js
+++ b/app/assets/javascripts/avalon_playlists/playlist_items.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/avalon_playlists/playlists.js.coffee b/app/assets/javascripts/avalon_playlists/playlists.js.coffee
index a191c0eba4..9789d1dcc0 100644
--- a/app/assets/javascripts/avalon_playlists/playlists.js.coffee
+++ b/app/assets/javascripts/avalon_playlists/playlists.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/avalon_progress.js.coffee b/app/assets/javascripts/avalon_progress.js.coffee
index 221ab7bbfe..3e5cb9efe1 100644
--- a/app/assets/javascripts/avalon_progress.js.coffee
+++ b/app/assets/javascripts/avalon_progress.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/avalon_timelines/timelines.js.coffee b/app/assets/javascripts/avalon_timelines/timelines.js.coffee
index c9d9bf0c43..870ea53faa 100644
--- a/app/assets/javascripts/avalon_timelines/timelines.js.coffee
+++ b/app/assets/javascripts/avalon_timelines/timelines.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/blacklight/facet_load.js b/app/assets/javascripts/blacklight/facet_load.js
index 235207bde3..bc69b6ff80 100644
--- a/app/assets/javascripts/blacklight/facet_load.js
+++ b/app/assets/javascripts/blacklight/facet_load.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/button_confirmation.js.coffee b/app/assets/javascripts/button_confirmation.js.coffee
index 000799c0f5..2d5b636bbe 100644
--- a/app/assets/javascripts/button_confirmation.js.coffee
+++ b/app/assets/javascripts/button_confirmation.js.coffee
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/assets/javascripts/crop_upload.js b/app/assets/javascripts/crop_upload.js
index 0be07e7e7c..a690c2279e 100644
--- a/app/assets/javascripts/crop_upload.js
+++ b/app/assets/javascripts/crop_upload.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/datatables.js b/app/assets/javascripts/datatables.js
index f310316b54..938410976f 100644
--- a/app/assets/javascripts/datatables.js
+++ b/app/assets/javascripts/datatables.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/direct_upload.js.coffee b/app/assets/javascripts/direct_upload.js.coffee
index 53ff54cd0f..10ec9d9df8 100644
--- a/app/assets/javascripts/direct_upload.js.coffee
+++ b/app/assets/javascripts/direct_upload.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/display_returned_items.js b/app/assets/javascripts/display_returned_items.js
index 8429370505..c61e734670 100644
--- a/app/assets/javascripts/display_returned_items.js
+++ b/app/assets/javascripts/display_returned_items.js
@@ -1,12 +1,12 @@
-/*
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
- *
+ * 
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software distributed
  *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
  *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/assets/javascripts/dynamic_fields.js.coffee b/app/assets/javascripts/dynamic_fields.js.coffee
index fb0d4c802b..0e65682b9b 100644
--- a/app/assets/javascripts/dynamic_fields.js.coffee
+++ b/app/assets/javascripts/dynamic_fields.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/expand_filename.js b/app/assets/javascripts/expand_filename.js
index 34b030da1d..bc533f37a1 100644
--- a/app/assets/javascripts/expand_filename.js
+++ b/app/assets/javascripts/expand_filename.js
@@ -1,3 +1,19 @@
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+ *   University.  Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ * 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed
+ *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ---  END LICENSE_HEADER BLOCK  ---
+*/
+
 function expandFilename(id) {
   var trunc = document.getElementById("truncated_" + id);
   var full = document.getElementById("full_" + id);
diff --git a/app/assets/javascripts/file_browse.js.coffee b/app/assets/javascripts/file_browse.js.coffee
index c1f3d41537..487a09f7bd 100644
--- a/app/assets/javascripts/file_browse.js.coffee
+++ b/app/assets/javascripts/file_browse.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/file_upload_step.js.coffee b/app/assets/javascripts/file_upload_step.js.coffee
index 563397b417..f72b32eeaa 100644
--- a/app/assets/javascripts/file_upload_step.js.coffee
+++ b/app/assets/javascripts/file_upload_step.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/fix_console.js b/app/assets/javascripts/fix_console.js
index 17774ffa30..9b1060dea5 100644
--- a/app/assets/javascripts/fix_console.js
+++ b/app/assets/javascripts/fix_console.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/hydra/hydra-head.js b/app/assets/javascripts/hydra/hydra-head.js
index 874da114f8..994087a1fa 100644
--- a/app/assets/javascripts/hydra/hydra-head.js
+++ b/app/assets/javascripts/hydra/hydra-head.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/import_button.js.coffee b/app/assets/javascripts/import_button.js.coffee
index cb66abe417..f77c985c5f 100644
--- a/app/assets/javascripts/import_button.js.coffee
+++ b/app/assets/javascripts/import_button.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/input_form_attribute_support.js.coffee b/app/assets/javascripts/input_form_attribute_support.js.coffee
index 02f25380d8..759a414b67 100644
--- a/app/assets/javascripts/input_form_attribute_support.js.coffee
+++ b/app/assets/javascripts/input_form_attribute_support.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/intercom_push.js b/app/assets/javascripts/intercom_push.js
index 4090d19da3..be8eb9d68a 100644
--- a/app/assets/javascripts/intercom_push.js
+++ b/app/assets/javascripts/intercom_push.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/localize_times.js b/app/assets/javascripts/localize_times.js
index 0c29368d66..9c536ff61d 100644
--- a/app/assets/javascripts/localize_times.js
+++ b/app/assets/javascripts/localize_times.js
@@ -1,3 +1,19 @@
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+ *   University.  Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ * 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed
+ *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ---  END LICENSE_HEADER BLOCK  ---
+*/
+
 // Requires moment.js
 function localize_times() {
   $('*[data-utc-time]').each(function() {
diff --git a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6 b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
index 12765c2587..5615aa5a9e 100644
--- a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
+++ b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
@@ -280,7 +280,7 @@ class MEJSPlayer {
     );
 
     // Build playlists button from the new stream when not in playlists
-    if(!playlistItemsT) {
+    if(!playlistItemsT && !this.mejsUtility.isMobile()) {
       this.player.options.playlistItemDefaultTitle = this.currentStreamInfo.embed_title;
       this.player.buildaddToPlaylist(this.player, null, null, null);
     }
@@ -290,11 +290,20 @@ class MEJSPlayer {
       this.player.buildplaylistItems(this.player, null, null, this.mediaElement);
     }
 
-    // Set defaultQuality in player options before building the quality feature
-    this.player.options.defaultQuality = this.localStorage.getItem('quality');
+    // Quality selector is turned off in mobile devices
+    if(!mejs.Features.isAndroid) {
+      // Set defaultQuality in player options before building the quality feature
+      this.player.options.defaultQuality = this.localStorage.getItem('quality');
 
-    // Build quality
-    this.player.buildquality(this.player, null, null, this.mediaElement);
+      // Build quality
+      this.player.buildquality(this.player, null, null, this.mediaElement);
+    } else {
+      // Set current source in absence of the quality selection
+      let currentSource = this.currentStreamInfo.stream_hls
+                        .filter(src => src.quality === this.player.options.defaultQuality)[0];
+     
+      this.player.setSrc(currentSource.url);
+    }
 
     // Set startVolume in options from the current mediaelement instance
     this.player.options.startVolume = this.mediaElement.volume;
@@ -314,8 +323,15 @@ class MEJSPlayer {
    */
   reInitializeCaptions() {
     if (this.currentStreamInfo.captions_path) {
-      // Place tracks button after volume button when tracks are available
-      this.player.featurePosition.tracks = this.player.featurePosition.volume + 1;
+      // Place tracks button
+      if(this.mejsUtility.isMobile()) {
+        // after trackScrubber button in mobile devices
+        this.player.featurePosition.tracks = this.player.featurePosition.trackScrubber + 1;
+      } else {
+        // after volume button in desktop devices
+        this.player.featurePosition.tracks = this.player.featurePosition.volume + 1;
+      }
+      
       this.player.buildtracks(this.player, null, this.player.layers, this.mediaElement);
       // Turn on captions
       this.toggleCaptions();
@@ -399,9 +415,17 @@ class MEJSPlayer {
     this.mejsUtility.showControlsBriefly(this.player);
     // Fix for paused seeking halt when using structure navigation
     // by forcing timeupdate event to fire with a quick and pause
-    if(this.mediaElement.paused) {
-      this.mediaElement.play();
-      this.mediaElement.pause();
+    if(this.mediaElement.paused && this.mediaElement) {
+      /** Reference: https://developer.chrome.com/blog/play-request-was-interrupted/ */
+      let playPromise = this.mediaElement.play();
+      if(playPromise !== undefined) {
+        playPromise.then(_ => {
+          this.mediaElement.pause();
+        })
+        .catch(error => {
+          console.log('Media player error: ', error);
+        })
+      }
     }
   }
 
@@ -446,7 +470,7 @@ class MEJSPlayer {
    * @return {void}
    */
   handleError(error, mediaElement, originalNode) {
-    console.log('MEJS CREATE ERROR: ' + error);
+    console.log('MEJS ERROR: ' + error);
   }
   /**
    * MediaElement render success callback function
diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_helper_utility.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_helper_utility.es6
index ecbfbb4abc..dfba22c634 100644
--- a/app/assets/javascripts/media_player_wrapper/mejs4_helper_utility.es6
+++ b/app/assets/javascripts/media_player_wrapper/mejs4_helper_utility.es6
@@ -30,8 +30,8 @@ class MEJSUtility {
       node = document.createElement('video');
       node.setAttribute('id', 'mejs-avalon-player');
       node.setAttribute('controls', '');
-      node.setAttribute('width', '450');
-      node.setAttribute('height', '309');
+      node.setAttribute('width', '480');
+      node.setAttribute('height', '270');
       node.setAttribute('style', 'width: 100%; height: 100%');
       if (currentStreamInfo.poster_image) {
         node.setAttribute('poster', currentStreamInfo.poster_image);
diff --git a/app/assets/javascripts/mejs4_player.js b/app/assets/javascripts/mejs4_player.js
index 8a4e8e0c4b..1e0af929f9 100644
--- a/app/assets/javascripts/mejs4_player.js
+++ b/app/assets/javascripts/mejs4_player.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/modernizr.js b/app/assets/javascripts/modernizr.js
index d06352eea2..9f880da1b5 100644
--- a/app/assets/javascripts/modernizr.js
+++ b/app/assets/javascripts/modernizr.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/move_section.js b/app/assets/javascripts/move_section.js
index 3cd0f4cf4d..fd46be6ea2 100644
--- a/app/assets/javascripts/move_section.js
+++ b/app/assets/javascripts/move_section.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/pop_help.js.coffee b/app/assets/javascripts/pop_help.js.coffee
index 61194c71e8..2ba2843712 100644
--- a/app/assets/javascripts/pop_help.js.coffee
+++ b/app/assets/javascripts/pop_help.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/popovers_and_tooltips.js.coffee b/app/assets/javascripts/popovers_and_tooltips.js.coffee
index 3f0da261d5..2b63b12576 100644
--- a/app/assets/javascripts/popovers_and_tooltips.js.coffee
+++ b/app/assets/javascripts/popovers_and_tooltips.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/refresh_token.js.coffee b/app/assets/javascripts/refresh_token.js.coffee
index a170b39bfd..55c856890c 100644
--- a/app/assets/javascripts/refresh_token.js.coffee
+++ b/app/assets/javascripts/refresh_token.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/select_all.js.coffee b/app/assets/javascripts/select_all.js.coffee
index 39adee1d60..ff51dccfc1 100644
--- a/app/assets/javascripts/select_all.js.coffee
+++ b/app/assets/javascripts/select_all.js.coffee
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/assets/javascripts/sessions_new.js b/app/assets/javascripts/sessions_new.js
index ed64bc99b5..96362ab846 100644
--- a/app/assets/javascripts/sessions_new.js
+++ b/app/assets/javascripts/sessions_new.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/sort_streams.js b/app/assets/javascripts/sort_streams.js
index c127fbc030..f27ea04ed0 100644
--- a/app/assets/javascripts/sort_streams.js
+++ b/app/assets/javascripts/sort_streams.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/javascripts/supplemental_files.js b/app/assets/javascripts/supplemental_files.js
index 9c4e8649cf..15b85618c2 100644
--- a/app/assets/javascripts/supplemental_files.js
+++ b/app/assets/javascripts/supplemental_files.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 16ce02f29e..bbe0d96bc3 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 468835f204..3cbebfb9fb 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon.scss b/app/assets/stylesheets/avalon.scss
index 866af83572..1d8065e434 100644
--- a/app/assets/stylesheets/avalon.scss
+++ b/app/assets/stylesheets/avalon.scss
@@ -1,12 +1,12 @@
-/*
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
- *
+ * 
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software distributed
  *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
  *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/assets/stylesheets/avalon/_accordions.scss b/app/assets/stylesheets/avalon/_accordions.scss
index f9ed637cd0..fa051441e6 100644
--- a/app/assets/stylesheets/avalon/_accordions.scss
+++ b/app/assets/stylesheets/avalon/_accordions.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_buttons.scss b/app/assets/stylesheets/avalon/_buttons.scss
index 9ff8d7c324..8b5f023328 100644
--- a/app/assets/stylesheets/avalon/_buttons.scss
+++ b/app/assets/stylesheets/avalon/_buttons.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_collections.scss b/app/assets/stylesheets/avalon/_collections.scss
index e08c8b3ae5..a8cb27ff35 100644
--- a/app/assets/stylesheets/avalon/_collections.scss
+++ b/app/assets/stylesheets/avalon/_collections.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_facets.scss b/app/assets/stylesheets/avalon/_facets.scss
index 5fa32bd2ff..3c54b2b0ca 100644
--- a/app/assets/stylesheets/avalon/_facets.scss
+++ b/app/assets/stylesheets/avalon/_facets.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_footer.scss b/app/assets/stylesheets/avalon/_footer.scss
index bcf5223bc0..bd0ffd66ad 100644
--- a/app/assets/stylesheets/avalon/_footer.scss
+++ b/app/assets/stylesheets/avalon/_footer.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_form.scss b/app/assets/stylesheets/avalon/_form.scss
index fc04d4ddb4..bceb1e904a 100644
--- a/app/assets/stylesheets/avalon/_form.scss
+++ b/app/assets/stylesheets/avalon/_form.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_header.scss b/app/assets/stylesheets/avalon/_header.scss
index 9c0debc58d..cc96774e2b 100644
--- a/app/assets/stylesheets/avalon/_header.scss
+++ b/app/assets/stylesheets/avalon/_header.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_homepage.scss b/app/assets/stylesheets/avalon/_homepage.scss
index 7a5fde7623..18c19c461b 100644
--- a/app/assets/stylesheets/avalon/_homepage.scss
+++ b/app/assets/stylesheets/avalon/_homepage.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_loading-spinner.scss b/app/assets/stylesheets/avalon/_loading-spinner.scss
index f43f491800..e622baab40 100644
--- a/app/assets/stylesheets/avalon/_loading-spinner.scss
+++ b/app/assets/stylesheets/avalon/_loading-spinner.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_mediaelement.scss b/app/assets/stylesheets/avalon/_mediaelement.scss
index 56142c611c..10f2746708 100644
--- a/app/assets/stylesheets/avalon/_mediaelement.scss
+++ b/app/assets/stylesheets/avalon/_mediaelement.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_mixins.scss b/app/assets/stylesheets/avalon/_mixins.scss
index 003c715ccf..05ca330b57 100644
--- a/app/assets/stylesheets/avalon/_mixins.scss
+++ b/app/assets/stylesheets/avalon/_mixins.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_modals.scss b/app/assets/stylesheets/avalon/_modals.scss
index 019acffa77..e3bff37b8d 100644
--- a/app/assets/stylesheets/avalon/_modals.scss
+++ b/app/assets/stylesheets/avalon/_modals.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_nav.scss b/app/assets/stylesheets/avalon/_nav.scss
index b3aeb97bf0..a2b0781000 100644
--- a/app/assets/stylesheets/avalon/_nav.scss
+++ b/app/assets/stylesheets/avalon/_nav.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_playlists.scss b/app/assets/stylesheets/avalon/_playlists.scss
index ad31850c6d..4af16d6c4b 100644
--- a/app/assets/stylesheets/avalon/_playlists.scss
+++ b/app/assets/stylesheets/avalon/_playlists.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/avalon/_timeliner.scss b/app/assets/stylesheets/avalon/_timeliner.scss
index e8671953e7..467783e289 100644
--- a/app/assets/stylesheets/avalon/_timeliner.scss
+++ b/app/assets/stylesheets/avalon/_timeliner.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/blacklight.scss b/app/assets/stylesheets/blacklight.scss
index 63f4664185..7c1f1c94ca 100644
--- a/app/assets/stylesheets/blacklight.scss
+++ b/app/assets/stylesheets/blacklight.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
@@ -22,6 +22,10 @@
   max-width: 160px;
 }
 
+.no-icon img, img.no-icon {
+  max-height: 90px;
+}
+
 .btn-outline-primary {
   @extend .btn-sm;
   @extend .btn-outline;
diff --git a/app/assets/stylesheets/blacklight_themes/avalon.scss b/app/assets/stylesheets/blacklight_themes/avalon.scss
index be04b58449..16d2486475 100644
--- a/app/assets/stylesheets/blacklight_themes/avalon.scss
+++ b/app/assets/stylesheets/blacklight_themes/avalon.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/branding.scss b/app/assets/stylesheets/branding.scss
index 50615f9747..48aa39c5fb 100644
--- a/app/assets/stylesheets/branding.scss
+++ b/app/assets/stylesheets/branding.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/datatables.scss b/app/assets/stylesheets/datatables.scss
index 8748faac3b..78e70fe510 100644
--- a/app/assets/stylesheets/datatables.scss
+++ b/app/assets/stylesheets/datatables.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index ac44f3c2eb..ee305b6052 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4/mediaelement-common-styles.scss b/app/assets/stylesheets/mejs4/mediaelement-common-styles.scss
index 5b6c1978ec..6756a26013 100644
--- a/app/assets/stylesheets/mejs4/mediaelement-common-styles.scss
+++ b/app/assets/stylesheets/mejs4/mediaelement-common-styles.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4/mejs4_link_back.scss b/app/assets/stylesheets/mejs4/mejs4_link_back.scss
index 89b95b54f7..214a8fa107 100644
--- a/app/assets/stylesheets/mejs4/mejs4_link_back.scss
+++ b/app/assets/stylesheets/mejs4/mejs4_link_back.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4/mejs4_plugin_add_marker_to_playlist.scss b/app/assets/stylesheets/mejs4/mejs4_plugin_add_marker_to_playlist.scss
index 1c9628e100..33ecbc7fe7 100644
--- a/app/assets/stylesheets/mejs4/mejs4_plugin_add_marker_to_playlist.scss
+++ b/app/assets/stylesheets/mejs4/mejs4_plugin_add_marker_to_playlist.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4/mejs4_plugin_add_to_playlist.scss b/app/assets/stylesheets/mejs4/mejs4_plugin_add_to_playlist.scss
index 302b2751c5..e6e4ef297b 100644
--- a/app/assets/stylesheets/mejs4/mejs4_plugin_add_to_playlist.scss
+++ b/app/assets/stylesheets/mejs4/mejs4_plugin_add_to_playlist.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4/mejs4_plugin_create_thumbnail.scss b/app/assets/stylesheets/mejs4/mejs4_plugin_create_thumbnail.scss
index e17bb0d77d..2cbd156faa 100644
--- a/app/assets/stylesheets/mejs4/mejs4_plugin_create_thumbnail.scss
+++ b/app/assets/stylesheets/mejs4/mejs4_plugin_create_thumbnail.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4/mejs4_plugin_track_scrubber.scss b/app/assets/stylesheets/mejs4/mejs4_plugin_track_scrubber.scss
index 5251da7017..4382d00cd4 100644
--- a/app/assets/stylesheets/mejs4/mejs4_plugin_track_scrubber.scss
+++ b/app/assets/stylesheets/mejs4/mejs4_plugin_track_scrubber.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/mejs4_player.scss b/app/assets/stylesheets/mejs4_player.scss
index a9bfee44df..8553854e9e 100644
--- a/app/assets/stylesheets/mejs4_player.scss
+++ b/app/assets/stylesheets/mejs4_player.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/assets/stylesheets/nestable.scss b/app/assets/stylesheets/nestable.scss
index 0de8913c26..3b032b69d5 100644
--- a/app/assets/stylesheets/nestable.scss
+++ b/app/assets/stylesheets/nestable.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/controllers/admin/collections_controller.rb b/app/controllers/admin/collections_controller.rb
index f7ab5d33ab..d62870d2a5 100644
--- a/app/controllers/admin/collections_controller.rb
+++ b/app/controllers/admin/collections_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index b72e6e830f..35f2064c3b 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66b002e46..7077cd790f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base
   helper_method :render_bookmarks_control?
 
   around_action :handle_api_request, if: proc{|c| request.format.json? || request.format.atom? }
-  before_action :rewrite_v4_ids, if: proc{|c| request.method_symbol == :get && [params[:id], params[:content]].compact.any? { |i| i =~ /^[a-z]+:[0-9]+$/}}
+  before_action :rewrite_v4_ids, if: proc{|c| request.method_symbol == :get && [params[:id], params[:content]].flatten.compact.any? { |i| i =~ /^[a-z]+:[0-9]+$/}}
   before_action :set_no_cache_headers, if: proc{|c| request.xhr? }
   prepend_before_action :remove_zero_width_chars
 
diff --git a/app/controllers/auth_forms_controller.rb b/app/controllers/auth_forms_controller.rb
index 21247d65a6..267715ac2d 100644
--- a/app/controllers/auth_forms_controller.rb
+++ b/app/controllers/auth_forms_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/avalon_marker_controller.rb b/app/controllers/avalon_marker_controller.rb
index 9ea235e00c..43e4f2987e 100644
--- a/app/controllers/avalon_marker_controller.rb
+++ b/app/controllers/avalon_marker_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 8d0416a948..c08fca68d3 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index 09d201ad65..5d07e6c0d0 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/checkouts_controller.rb b/app/controllers/checkouts_controller.rb
index 0b0863ae8a..59e0a208a8 100644
--- a/app/controllers/checkouts_controller.rb
+++ b/app/controllers/checkouts_controller.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 class CheckoutsController < ApplicationController
   before_action :set_checkout, only: %i[show update destroy]
   before_action :set_checkouts, only: %i[index return_all]
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 863ffb3cfe..e601a8c48f 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 7bd7b380e1..3967d7ce41 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/controllers/concerns/blacklight_helper_reload_fix.rb b/app/controllers/concerns/blacklight_helper_reload_fix.rb
index e4240e33cf..88fea03b08 100644
--- a/app/controllers/concerns/blacklight_helper_reload_fix.rb
+++ b/app/controllers/concerns/blacklight_helper_reload_fix.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/concerns/conditional_partials.rb b/app/controllers/concerns/conditional_partials.rb
index f4a585ae11..2e6e4f7e96 100644
--- a/app/controllers/concerns/conditional_partials.rb
+++ b/app/controllers/concerns/conditional_partials.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/derivatives_controller.rb b/app/controllers/derivatives_controller.rb
index e2e8a6932d..81c77963c5 100644
--- a/app/controllers/derivatives_controller.rb
+++ b/app/controllers/derivatives_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/controllers/dropbox_controller.rb b/app/controllers/dropbox_controller.rb
index da46417062..f28b24fa04 100644
--- a/app/controllers/dropbox_controller.rb
+++ b/app/controllers/dropbox_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/encode_records_controller.rb b/app/controllers/encode_records_controller.rb
index cf45d291c1..e860175e3d 100644
--- a/app/controllers/encode_records_controller.rb
+++ b/app/controllers/encode_records_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -59,7 +59,7 @@ def paged_index
     # Sort
     sort_column = columns[params['order']['0']['column'].to_i]
     sort_direction = params['order']['0']['dir'] == 'desc' ? 'desc' : 'asc'
-    @encode_records = @encode_records.order("lower(CAST(#{sort_column} as char)) #{sort_direction}, #{sort_column} #{sort_direction}")
+    @encode_records = @encode_records.order(Arel.sql("lower(CAST(#{sort_column} as char)) #{sort_direction}, #{sort_column} #{sort_direction}"))
 
     # Paginate
     page_num = (params['start'].to_i / params['length'].to_i).floor + 1
diff --git a/app/controllers/master_files_controller.rb b/app/controllers/master_files_controller.rb
index 98854b85c4..d16f661c7f 100644
--- a/app/controllers/master_files_controller.rb
+++ b/app/controllers/master_files_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -325,6 +325,10 @@ def hls_manifest
     end
   end
 
+  def caption_manifest
+    return head :unauthorized if cannot?(:read, @master_file)
+  end
+
   def structure
     authorize! :read, @master_file, message: "You do not have sufficient privileges"
     render json: @master_file.structuralMetadata.as_json
diff --git a/app/controllers/media_objects_controller.rb b/app/controllers/media_objects_controller.rb
index d4f3f4f105..04bfc4669f 100644
--- a/app/controllers/media_objects_controller.rb
+++ b/app/controllers/media_objects_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -173,14 +173,17 @@ def json_update
   end
 
   def update_media_object
-    begin
-      collection = Admin::Collection.find(api_params[:collection_id])
-    rescue ActiveFedora::ObjectNotFoundError
-      render json: { errors: ["Collection not found for #{api_params[:collection_id]}"] }, status: 422
-      return
+    if (api_params[:collection_id].present?)
+      begin
+        collection = Admin::Collection.find(api_params[:collection_id])
+      rescue ActiveFedora::ObjectNotFoundError
+        render json: { errors: ["Collection not found for #{api_params[:collection_id]}"] }, status: 422
+        return
+      end
+      
+      @media_object.collection = collection
     end
 
-    @media_object.collection = collection
     @media_object.avalon_uploader = 'REST API'
 
     populate_from_catalog = (!!api_params[:import_bib_record] && media_object_parameters[:bibliographic_id].present?)
@@ -197,9 +200,9 @@ def update_media_object
         bib_source = media_object_parameters.dig(:bibliographic_id, :source) || ''
         logger.warn "Failed bib import using bibID #{bib_id}, #{bib_source}"
       ensure
-        if !@media_object.valid?
+        unless @media_object.valid?
           # Fall back to MODS as sent if Bib Import fails
-          @media_object.update_attributes(media_object_parameters.slice(*@media_object.errors.keys)) if params.has_key?(:fields) and params[:fields].respond_to?(:has_key?)
+          @media_object.update_attributes(media_object_parameters.slice(*@media_object.errors.attribute_names)) if params.has_key?(:fields) and params[:fields].respond_to?(:has_key?)
         end
       end
     else
@@ -208,7 +211,7 @@ def update_media_object
 
     error_messages = []
     unless @media_object.valid?
-      invalid_fields = @media_object.errors.keys
+      invalid_fields = @media_object.errors.attribute_names
       required_fields = [:title, :date_issued]
       unless required_fields.any? { |f| invalid_fields.include? f }
         invalid_fields.each do |field|
diff --git a/app/controllers/objects_controller.rb b/app/controllers/objects_controller.rb
index d418a19f09..b7184aeb8b 100644
--- a/app/controllers/objects_controller.rb
+++ b/app/controllers/objects_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/playlist_items_controller.rb b/app/controllers/playlist_items_controller.rb
index 7be5d99900..01fa2a9059 100644
--- a/app/controllers/playlist_items_controller.rb
+++ b/app/controllers/playlist_items_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/playlists_controller.rb b/app/controllers/playlists_controller.rb
index 6e1215d70f..31faa1ecc6 100644
--- a/app/controllers/playlists_controller.rb
+++ b/app/controllers/playlists_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/controllers/samvera/persona/users_controller.rb b/app/controllers/samvera/persona/users_controller.rb
index 64fc6b2889..3c890ad90a 100644
--- a/app/controllers/samvera/persona/users_controller.rb
+++ b/app/controllers/samvera/persona/users_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/controllers/supplemental_files_controller.rb b/app/controllers/supplemental_files_controller.rb
index 17c516f169..a8ccf15e89 100644
--- a/app/controllers/supplemental_files_controller.rb
+++ b/app/controllers/supplemental_files_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/timelines_controller.rb b/app/controllers/timelines_controller.rb
index 8b9b84be66..8dca8aa444 100644
--- a/app/controllers/timelines_controller.rb
+++ b/app/controllers/timelines_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index e1d65c88a1..492bfc8707 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -48,7 +48,7 @@ def login_popup?
   end
 
   def find_user(auth_type)
-    auth_type.downcase!
+    auth_type = auth_type.downcase
     find_method = "find_for_#{auth_type}".to_sym
     find_method = :find_for_generic unless User.respond_to?(find_method)
     logger.debug "#{auth_type} :: #{current_user.inspect}"
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
index 121d8b1567..0b64dfb2af 100644
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/controllers/vocabulary_controller.rb b/app/controllers/vocabulary_controller.rb
index e6d75a6874..cea4470ce7 100644
--- a/app/controllers/vocabulary_controller.rb
+++ b/app/controllers/vocabulary_controller.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f48d62a201..ec643663ce 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -217,6 +217,7 @@ def vgroup_display value
 
   def truncate_center label, output_label_length, end_length = 0
     end_length = output_label_length / 2 - 3 if end_length == 0
+    end_length = 0 if end_length.negative?
     truncate(label, length: output_label_length,
       omission: "...#{label.last(end_length)}")
   end
diff --git a/app/helpers/blacklight/local_blacklight_helper.rb b/app/helpers/blacklight/local_blacklight_helper.rb
index 50d14df05b..24d3dea4bc 100644
--- a/app/helpers/blacklight/local_blacklight_helper.rb
+++ b/app/helpers/blacklight/local_blacklight_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb
index 0459fadeba..32b19db134 100644
--- a/app/helpers/catalog_helper.rb
+++ b/app/helpers/catalog_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/cdl_helper.rb b/app/helpers/cdl_helper.rb
index 364b0a9cf0..b1bcc93246 100644
--- a/app/helpers/cdl_helper.rb
+++ b/app/helpers/cdl_helper.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/helpers/conditional_partials_helper.rb b/app/helpers/conditional_partials_helper.rb
index ad10123adf..eaf5fec4ab 100644
--- a/app/helpers/conditional_partials_helper.rb
+++ b/app/helpers/conditional_partials_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/media_objects_helper.rb b/app/helpers/media_objects_helper.rb
index c435a20b73..a6f44d32ff 100644
--- a/app/helpers/media_objects_helper.rb
+++ b/app/helpers/media_objects_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/player_helper.rb b/app/helpers/player_helper.rb
index d0939fe712..a9a75529c7 100644
--- a/app/helpers/player_helper.rb
+++ b/app/helpers/player_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/playlists_helper.rb b/app/helpers/playlists_helper.rb
index b0108ff136..f20548d913 100644
--- a/app/helpers/playlists_helper.rb
+++ b/app/helpers/playlists_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/security_helper.rb b/app/helpers/security_helper.rb
index 98bc0821cc..57e99e14ea 100644
--- a/app/helpers/security_helper.rb
+++ b/app/helpers/security_helper.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/helpers/timelines_helper.rb b/app/helpers/timelines_helper.rb
index 0091a0453a..99b40ad7f9 100644
--- a/app/helpers/timelines_helper.rb
+++ b/app/helpers/timelines_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/helpers/upload_form_helper.rb b/app/helpers/upload_form_helper.rb
index fc46645388..7a34d4b97f 100644
--- a/app/helpers/upload_form_helper.rb
+++ b/app/helpers/upload_form_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -27,13 +27,14 @@ def upload_form_data
     if direct_upload?
       bucket = Aws::S3::Bucket.new(name: Settings.encoding.masterfile_bucket)
       direct_post = bucket.presigned_post(key: "uploads/#{SecureRandom.uuid}/${filename}", success_action_status: '201')
+      upload_form_url = direct_post.url
       if Settings.minio.present? && Settings.minio.public_host.present?
-        direct_post.url.sub!(Settings.minio.endpoint, Settings.minio.public_host)
+        upload_form_url = direct_post.url.sub(Settings.minio.endpoint, Settings.minio.public_host)
       end
       {
         'form-data' => (direct_post.fields),
-        'url' => direct_post.url,
-        'host' => Addressable::URI.parse(direct_post.url).host
+        'url' => upload_form_url,
+        'host' => Addressable::URI.parse(upload_form_url).host
       }
     else
       {}
diff --git a/app/javascript/components/CollectionCarousel.js b/app/javascript/components/CollectionCarousel.js
index 41174c7949..e343825f4d 100644
--- a/app/javascript/components/CollectionCarousel.js
+++ b/app/javascript/components/CollectionCarousel.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/CollectionDetails.js b/app/javascript/components/CollectionDetails.js
index b0e8690a3d..b9d59c076d 100644
--- a/app/javascript/components/CollectionDetails.js
+++ b/app/javascript/components/CollectionDetails.js
@@ -1,12 +1,12 @@
-/*
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
- *
+ * 
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software distributed
  *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
  *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/javascript/components/CollectionList.js b/app/javascript/components/CollectionList.js
index 236c5d74fc..cd0d547904 100644
--- a/app/javascript/components/CollectionList.js
+++ b/app/javascript/components/CollectionList.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/ReactButtonContainer.jsx b/app/javascript/components/ReactButtonContainer.jsx
index 8956a5fa53..2a6dff5153 100644
--- a/app/javascript/components/ReactButtonContainer.jsx
+++ b/app/javascript/components/ReactButtonContainer.jsx
@@ -7,22 +7,25 @@ class ReactButtonContainer extends Component {
   constructor(props) {
     super(props);
 
-    const { audioURL, baseURL, initStructure, masterFileID, streamDuration } = this.props;
+    const {
+      baseURL,
+      masterFileID,
+      mediaObjectID,
+      canvasIndex,
+    } = this.props;
     this.state = {
       show: false,
       smeProps: {
         structureURL: baseURL + '/master_files/' + masterFileID + '/structure.json',
-        waveformURL: baseURL + '/master_files/' + masterFileID + '/waveform.json',
-        initStructure: initStructure,
-        audioURL: audioURL,
-        streamDuration: Number(streamDuration)
+        manifestURL: baseURL + '/media_objects/' + mediaObjectID + '/manifest.json',
+        canvasIndex: canvasIndex,
       },
       structureSaved: true
     };
   }
 
   handleClose = () => {
-    if(!this.state.structureSaved) {
+    if (!this.state.structureSaved) {
       if (confirm("Unsaved changes will be lost. Are you sure?")) {
         this.setState({
           show: false
@@ -44,10 +47,10 @@ class ReactButtonContainer extends Component {
 
   getStructureStatus = (value) => {
     this.setState({ structureSaved: value });
-  }
+  };
 
   render() {
-    const modalID = `edit_structure_${this.props.sectionIndex}`;
+    const modalID = `edit_structure_${this.props.canvasIndex}`;
     return (
       <div className="ReactButtonContainer">
         <button
@@ -57,7 +60,14 @@ class ReactButtonContainer extends Component {
           Edit Structure
         </button>
 
-        <Modal id={modalID} show={this.state.show} animation={false} onHide={this.handleClose} backdrop="static" className="sme-modal-wrapper" dialogClassName="modal-wrapper-body">
+        <Modal
+          id={modalID}
+          show={this.state.show}
+          animation={false}
+          onHide={this.handleClose}
+          backdrop="static"
+          className="sme-modal-wrapper"
+          dialogClassName="modal-wrapper-body">
           <Modal.Header closeButton>
             <Modal.Title>Edit Structure</Modal.Title>
           </Modal.Header>
diff --git a/app/javascript/components/ReactButtonContainer.scss b/app/javascript/components/ReactButtonContainer.scss
index d7633bb388..3fcb1bc956 100644
--- a/app/javascript/components/ReactButtonContainer.scss
+++ b/app/javascript/components/ReactButtonContainer.scss
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/Search.js b/app/javascript/components/Search.js
index c8a1fc6912..8e30d790b6 100644
--- a/app/javascript/components/Search.js
+++ b/app/javascript/components/Search.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collection_index.html b/app/javascript/components/collection_index.html
index 22147cc628..925ab6f309 100644
--- a/app/javascript/components/collection_index.html
+++ b/app/javascript/components/collection_index.html
@@ -1,5 +1,5 @@
 <!--
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/javascript/components/collection_index.js b/app/javascript/components/collection_index.js
index 5105cbfe6d..fd7fa6e3b6 100644
--- a/app/javascript/components/collection_index.js
+++ b/app/javascript/components/collection_index.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collection_view.html b/app/javascript/components/collection_view.html
index 22147cc628..925ab6f309 100644
--- a/app/javascript/components/collection_view.html
+++ b/app/javascript/components/collection_view.html
@@ -1,5 +1,5 @@
 <!--
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/javascript/components/collection_view.js b/app/javascript/components/collection_view.js
index db6b7fbd53..26c3c19aa8 100644
--- a/app/javascript/components/collection_view.js
+++ b/app/javascript/components/collection_view.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/Collection.scss b/app/javascript/components/collections/Collection.scss
index c5691361c7..3cf123e7a6 100644
--- a/app/javascript/components/collections/Collection.scss
+++ b/app/javascript/components/collections/Collection.scss
@@ -1,12 +1,12 @@
-/*
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
- *
+ * 
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software distributed
  *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
  *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/javascript/components/collections/CollectionCardBody.js b/app/javascript/components/collections/CollectionCardBody.js
index 2290306aac..427b3e6b0f 100644
--- a/app/javascript/components/collections/CollectionCardBody.js
+++ b/app/javascript/components/collections/CollectionCardBody.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/CollectionCardShell.js b/app/javascript/components/collections/CollectionCardShell.js
index 10c1fab042..12a761d559 100644
--- a/app/javascript/components/collections/CollectionCardShell.js
+++ b/app/javascript/components/collections/CollectionCardShell.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/CollectionCardThumbnail.js b/app/javascript/components/collections/CollectionCardThumbnail.js
index 989feca693..df4117f809 100644
--- a/app/javascript/components/collections/CollectionCardThumbnail.js
+++ b/app/javascript/components/collections/CollectionCardThumbnail.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/CollectionsFilterNoResults.js b/app/javascript/components/collections/CollectionsFilterNoResults.js
index f7c531841a..5b1e6a263e 100644
--- a/app/javascript/components/collections/CollectionsFilterNoResults.js
+++ b/app/javascript/components/collections/CollectionsFilterNoResults.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/landing/FacetBadges.js b/app/javascript/components/collections/landing/FacetBadges.js
index 625f910c6f..d7a82ed591 100644
--- a/app/javascript/components/collections/landing/FacetBadges.js
+++ b/app/javascript/components/collections/landing/FacetBadges.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/landing/FacetPanel.js b/app/javascript/components/collections/landing/FacetPanel.js
index 50213ff812..c8058e435e 100644
--- a/app/javascript/components/collections/landing/FacetPanel.js
+++ b/app/javascript/components/collections/landing/FacetPanel.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/landing/Facets.js b/app/javascript/components/collections/landing/Facets.js
index a312c0aa37..d36af9905e 100644
--- a/app/javascript/components/collections/landing/Facets.js
+++ b/app/javascript/components/collections/landing/Facets.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/landing/Pagination.js b/app/javascript/components/collections/landing/Pagination.js
index c70f45348b..9fa09cf0d3 100644
--- a/app/javascript/components/collections/landing/Pagination.js
+++ b/app/javascript/components/collections/landing/Pagination.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/landing/SearchResults.js b/app/javascript/components/collections/landing/SearchResults.js
index d326a0ed70..82272cd549 100644
--- a/app/javascript/components/collections/landing/SearchResults.js
+++ b/app/javascript/components/collections/landing/SearchResults.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/landing/SearchResultsCard.js b/app/javascript/components/collections/landing/SearchResultsCard.js
index 35ddd42276..16bb2071d3 100644
--- a/app/javascript/components/collections/landing/SearchResultsCard.js
+++ b/app/javascript/components/collections/landing/SearchResultsCard.js
@@ -1,12 +1,12 @@
-/*
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+/* 
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
- *
+ * 
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software distributed
  *   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
  *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/javascript/components/collections/list/ButtonCollectionListShowAll.js b/app/javascript/components/collections/list/ButtonCollectionListShowAll.js
index da40c7fec1..86ee5b8f94 100644
--- a/app/javascript/components/collections/list/ButtonCollectionListShowAll.js
+++ b/app/javascript/components/collections/list/ButtonCollectionListShowAll.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/list/CollectionCard.js b/app/javascript/components/collections/list/CollectionCard.js
index 5c8bc429a9..f9e288a51d 100644
--- a/app/javascript/components/collections/list/CollectionCard.js
+++ b/app/javascript/components/collections/list/CollectionCard.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/list/CollectionListStickyUtils.js b/app/javascript/components/collections/list/CollectionListStickyUtils.js
index ecf27fb842..9fa0137a1e 100644
--- a/app/javascript/components/collections/list/CollectionListStickyUtils.js
+++ b/app/javascript/components/collections/list/CollectionListStickyUtils.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/list/CollectionsSortedByAZ.js b/app/javascript/components/collections/list/CollectionsSortedByAZ.js
index 748f970c93..e8a192ac67 100644
--- a/app/javascript/components/collections/list/CollectionsSortedByAZ.js
+++ b/app/javascript/components/collections/list/CollectionsSortedByAZ.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/list/CollectionsSortedByUnit.js b/app/javascript/components/collections/list/CollectionsSortedByUnit.js
index 572f308500..32b378fd1d 100644
--- a/app/javascript/components/collections/list/CollectionsSortedByUnit.js
+++ b/app/javascript/components/collections/list/CollectionsSortedByUnit.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/collections/list/Unit.js b/app/javascript/components/collections/list/Unit.js
index c25c39ab84..58d31a7d82 100644
--- a/app/javascript/components/collections/list/Unit.js
+++ b/app/javascript/components/collections/list/Unit.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/components/ui/LoadingSpinner.js b/app/javascript/components/ui/LoadingSpinner.js
index e5fe631376..170d39a40d 100644
--- a/app/javascript/components/ui/LoadingSpinner.js
+++ b/app/javascript/components/ui/LoadingSpinner.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/iiif-timeliner-styles.css b/app/javascript/iiif-timeliner-styles.css
index b380975f94..cfa49241d6 100644
--- a/app/javascript/iiif-timeliner-styles.css
+++ b/app/javascript/iiif-timeliner-styles.css
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 024d4ac940..c645f64c64 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/packs/iiif-timeliner.js b/app/javascript/packs/iiif-timeliner.js
index 3c55430ef5..f84e006dd8 100644
--- a/app/javascript/packs/iiif-timeliner.js
+++ b/app/javascript/packs/iiif-timeliner.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/packs/server_rendering.js b/app/javascript/packs/server_rendering.js
index 8e2ad2a5ee..10bf82a5fb 100644
--- a/app/javascript/packs/server_rendering.js
+++ b/app/javascript/packs/server_rendering.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/javascript/services.js b/app/javascript/services.js
index 9d78cddc03..93aaf9e1da 100644
--- a/app/javascript/services.js
+++ b/app/javascript/services.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/app/jobs/active_encode_jobs.rb b/app/jobs/active_encode_jobs.rb
index d833516482..27f9ae29b0 100644
--- a/app/jobs/active_encode_jobs.rb
+++ b/app/jobs/active_encode_jobs.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index a009ace51c..30c5061965 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,2 +1,16 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 class ApplicationJob < ActiveJob::Base
 end
diff --git a/app/jobs/batch_ingest_job.rb b/app/jobs/batch_ingest_job.rb
index 058342ae01..448f50c163 100644
--- a/app/jobs/batch_ingest_job.rb
+++ b/app/jobs/batch_ingest_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/batch_scan_job.rb b/app/jobs/batch_scan_job.rb
index eb47f8e508..9303740104 100644
--- a/app/jobs/batch_scan_job.rb
+++ b/app/jobs/batch_scan_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/bulk_action_jobs.rb b/app/jobs/bulk_action_jobs.rb
index 43e25fa8f5..9067f20698 100644
--- a/app/jobs/bulk_action_jobs.rb
+++ b/app/jobs/bulk_action_jobs.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/jobs/cleanup_session_job.rb b/app/jobs/cleanup_session_job.rb
index 62fae72620..97b542338a 100644
--- a/app/jobs/cleanup_session_job.rb
+++ b/app/jobs/cleanup_session_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/cleanup_working_file_job.rb b/app/jobs/cleanup_working_file_job.rb
index 05e9b55e5b..e9dd547d46 100644
--- a/app/jobs/cleanup_working_file_job.rb
+++ b/app/jobs/cleanup_working_file_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/delete_course_job.rb b/app/jobs/delete_course_job.rb
index ae1e3507e5..1fd14650ed 100644
--- a/app/jobs/delete_course_job.rb
+++ b/app/jobs/delete_course_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/delete_derivative_job.rb b/app/jobs/delete_derivative_job.rb
index 690ebc6db1..a169fe0add 100644
--- a/app/jobs/delete_derivative_job.rb
+++ b/app/jobs/delete_derivative_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/delete_dropbox_job.rb b/app/jobs/delete_dropbox_job.rb
index 9002849c53..8044eba69b 100644
--- a/app/jobs/delete_dropbox_job.rb
+++ b/app/jobs/delete_dropbox_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/delete_old_searches_job.rb b/app/jobs/delete_old_searches_job.rb
index 8c449dc3fe..4c0d2239be 100644
--- a/app/jobs/delete_old_searches_job.rb
+++ b/app/jobs/delete_old_searches_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/extract_still_job.rb b/app/jobs/extract_still_job.rb
index e923eec373..11791a71aa 100644
--- a/app/jobs/extract_still_job.rb
+++ b/app/jobs/extract_still_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/ingest_batch_entry_job.rb b/app/jobs/ingest_batch_entry_job.rb
index f047ad787f..09974bf376 100644
--- a/app/jobs/ingest_batch_entry_job.rb
+++ b/app/jobs/ingest_batch_entry_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/ingest_batch_status_email_jobs.rb b/app/jobs/ingest_batch_status_email_jobs.rb
index 1b08b06eef..d5de44fbc6 100644
--- a/app/jobs/ingest_batch_status_email_jobs.rb
+++ b/app/jobs/ingest_batch_status_email_jobs.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/master_file_management_jobs.rb b/app/jobs/master_file_management_jobs.rb
index 6e68dc1fcd..612769592f 100644
--- a/app/jobs/master_file_management_jobs.rb
+++ b/app/jobs/master_file_management_jobs.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/media_object_indexing_job.rb b/app/jobs/media_object_indexing_job.rb
new file mode 100644
index 0000000000..0de943a5e6
--- /dev/null
+++ b/app/jobs/media_object_indexing_job.rb
@@ -0,0 +1,22 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
+class MediaObjectIndexingJob < ApplicationJob
+  queue_as :media_object_indexing
+
+  def perform(id)
+    mo = MediaObject.find(id)
+    ActiveFedora::SolrService.add(mo.to_solr(include_child_fields: true), softCommit: true)
+  end
+end
diff --git a/app/jobs/reindex_job.rb b/app/jobs/reindex_job.rb
index 2754e9ddc0..216db8a078 100644
--- a/app/jobs/reindex_job.rb
+++ b/app/jobs/reindex_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/s3_split_job.rb b/app/jobs/s3_split_job.rb
index 8b46f8b65b..4396d46937 100644
--- a/app/jobs/s3_split_job.rb
+++ b/app/jobs/s3_split_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/solr_backup_job.rb b/app/jobs/solr_backup_job.rb
index 9d2b5ebb85..3b58bff4f0 100644
--- a/app/jobs/solr_backup_job.rb
+++ b/app/jobs/solr_backup_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/update_dependent_permalinks_job.rb b/app/jobs/update_dependent_permalinks_job.rb
index 0db7cfa014..cde673b779 100644
--- a/app/jobs/update_dependent_permalinks_job.rb
+++ b/app/jobs/update_dependent_permalinks_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/jobs/waveform_job.rb b/app/jobs/waveform_job.rb
index ac07b5dd01..6fc4bd51be 100644
--- a/app/jobs/waveform_job.rb
+++ b/app/jobs/waveform_job.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 056e3b67f8..d4178f3602 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/mailers/batch_registries_mailer.rb b/app/mailers/batch_registries_mailer.rb
index 7b92f30fbf..c85329f92d 100644
--- a/app/mailers/batch_registries_mailer.rb
+++ b/app/mailers/batch_registries_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/mailers/comments_mailer.rb b/app/mailers/comments_mailer.rb
index f6fe545923..9ab8866209 100644
--- a/app/mailers/comments_mailer.rb
+++ b/app/mailers/comments_mailer.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/mailers/ingest_batch_mailer.rb b/app/mailers/ingest_batch_mailer.rb
index 0293002aa0..e14d884b73 100644
--- a/app/mailers/ingest_batch_mailer.rb
+++ b/app/mailers/ingest_batch_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/mailers/notifications_mailer.rb b/app/mailers/notifications_mailer.rb
index 63e2d599bd..60776ecf50 100644
--- a/app/mailers/notifications_mailer.rb
+++ b/app/mailers/notifications_mailer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index e07a2fb60b..1ec76affe2 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -165,6 +165,11 @@ def custom_permissions(user=nil, session=nil)
         # anyone who can edit a media_object can also push it
         can? :edit, media_object
       end
+
+      can :json_update, MediaObject do |media_object|
+        # anyone who can edit a media_object can also update it via the API
+        is_api_request? && can?(:edit, media_object)
+      end
     end
   end
 
diff --git a/app/models/access_control_step.rb b/app/models/access_control_step.rb
index b62e8e0ede..e4662e9645 100644
--- a/app/models/access_control_step.rb
+++ b/app/models/access_control_step.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/models/admin/collection.rb b/app/models/admin/collection.rb
index 9deac6daf8..2045c307c5 100644
--- a/app/models/admin/collection.rb
+++ b/app/models/admin/collection.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -34,7 +34,7 @@ class Admin::Collection < ActiveFedora::Base
   property :name, predicate: ::RDF::Vocab::DC.title, multiple: false do |index|
     index.as :stored_sortable
   end
-  property :unit, predicate: ::RDF::Vocab::Bibframe.heldBy, multiple: false do |index|
+  property :unit, predicate: Avalon::RDFVocab::Bibframe.heldBy, multiple: false do |index|
     index.as :stored_sortable
   end
   property :description, predicate: ::RDF::Vocab::DC.description, multiple: false do |index|
diff --git a/app/models/admin/group.rb b/app/models/admin/group.rb
index 569c815b1c..ae40c076bc 100644
--- a/app/models/admin/group.rb
+++ b/app/models/admin/group.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/api_token.rb b/app/models/api_token.rb
index 5f1483915b..bbaf185ffd 100644
--- a/app/models/api_token.rb
+++ b/app/models/api_token.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index d8400e960c..01819f5b37 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/avalon/rdf_vocab.rb b/app/models/avalon/rdf_vocab.rb
index 408fe2b79d..ccc60d8c34 100644
--- a/app/models/avalon/rdf_vocab.rb
+++ b/app/models/avalon/rdf_vocab.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -66,5 +66,15 @@ class Collection < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/vocab
       property :default_hidden,           "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :cdl_enabled,              "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
     end
+
+    class EBUCore < RDF::StrictVocabulary("http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#")
+      property :filename,   "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+      property :identifier, "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+      property :locator,    "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+    end
+
+    class Bibframe < RDF::StrictVocabulary("http://bibframe.org/vocab/")
+      property :heldBy,   "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+    end
   end
 end
diff --git a/app/models/avalon_annotation.rb b/app/models/avalon_annotation.rb
index 10eff3c0b4..4cffe27073 100644
--- a/app/models/avalon_annotation.rb
+++ b/app/models/avalon_annotation.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/avalon_clip.rb b/app/models/avalon_clip.rb
index 81943ad588..1ff9afca2f 100644
--- a/app/models/avalon_clip.rb
+++ b/app/models/avalon_clip.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/avalon_marker.rb b/app/models/avalon_marker.rb
index 37f0a69020..ce637fd489 100644
--- a/app/models/avalon_marker.rb
+++ b/app/models/avalon_marker.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/batch_entries.rb b/app/models/batch_entries.rb
index a64698a88e..91334c48e0 100644
--- a/app/models/batch_entries.rb
+++ b/app/models/batch_entries.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/batch_registries.rb b/app/models/batch_registries.rb
index 753385f2f0..c39c5bf23f 100644
--- a/app/models/batch_registries.rb
+++ b/app/models/batch_registries.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/checkout.rb b/app/models/checkout.rb
index 34bbf08fd0..9d0812d668 100644
--- a/app/models/checkout.rb
+++ b/app/models/checkout.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 class Checkout < ApplicationRecord
   belongs_to :user
 
diff --git a/app/models/collection_search_builder.rb b/app/models/collection_search_builder.rb
index 42000c710c..2a3016a835 100644
--- a/app/models/collection_search_builder.rb
+++ b/app/models/collection_search_builder.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 2d0a731828..c4ecfc6913 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/models/concerns/derivative_behavior.rb b/app/models/concerns/derivative_behavior.rb
index fc7ca9f8b8..7ff30e2fe2 100644
--- a/app/models/concerns/derivative_behavior.rb
+++ b/app/models/concerns/derivative_behavior.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/derivative_intercom.rb b/app/models/concerns/derivative_intercom.rb
index d48f1d4281..0859c58f47 100644
--- a/app/models/concerns/derivative_intercom.rb
+++ b/app/models/concerns/derivative_intercom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/frame_size.rb b/app/models/concerns/frame_size.rb
index e249f2f637..228e58ad7c 100644
--- a/app/models/concerns/frame_size.rb
+++ b/app/models/concerns/frame_size.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/hidden.rb b/app/models/concerns/hidden.rb
index 3f2126648f..265e33480f 100644
--- a/app/models/concerns/hidden.rb
+++ b/app/models/concerns/hidden.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/identifier.rb b/app/models/concerns/identifier.rb
index d56d4818ff..28bbc6303a 100644
--- a/app/models/concerns/identifier.rb
+++ b/app/models/concerns/identifier.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/master_file_behavior.rb b/app/models/concerns/master_file_behavior.rb
index 51f29c563d..a6c87fdde2 100644
--- a/app/models/concerns/master_file_behavior.rb
+++ b/app/models/concerns/master_file_behavior.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/master_file_intercom.rb b/app/models/concerns/master_file_intercom.rb
index 8432264600..28310bea8f 100644
--- a/app/models/concerns/master_file_intercom.rb
+++ b/app/models/concerns/master_file_intercom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/media_object_intercom.rb b/app/models/concerns/media_object_intercom.rb
index 7a6f5dc98c..4b94e3e583 100644
--- a/app/models/concerns/media_object_intercom.rb
+++ b/app/models/concerns/media_object_intercom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/media_object_mods.rb b/app/models/concerns/media_object_mods.rb
index 140400baa6..ea853db107 100644
--- a/app/models/concerns/media_object_mods.rb
+++ b/app/models/concerns/media_object_mods.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/migration_target.rb b/app/models/concerns/migration_target.rb
index 66dde881db..7fe306cda5 100644
--- a/app/models/concerns/migration_target.rb
+++ b/app/models/concerns/migration_target.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/permalink.rb b/app/models/concerns/permalink.rb
index 3aa8544529..323be29241 100644
--- a/app/models/concerns/permalink.rb
+++ b/app/models/concerns/permalink.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/supplemental_file_behavior.rb b/app/models/concerns/supplemental_file_behavior.rb
index c2cc3c77ba..4d9b6e71d0 100644
--- a/app/models/concerns/supplemental_file_behavior.rb
+++ b/app/models/concerns/supplemental_file_behavior.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/concerns/virtual_groups.rb b/app/models/concerns/virtual_groups.rb
index 38616e3d7b..d4c410f274 100644
--- a/app/models/concerns/virtual_groups.rb
+++ b/app/models/concerns/virtual_groups.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/course.rb b/app/models/course.rb
index a085355b2a..326b39b66a 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/derivative.rb b/app/models/derivative.rb
index a23033d0d5..4efb824daa 100644
--- a/app/models/derivative.rb
+++ b/app/models/derivative.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -22,7 +22,7 @@ class Derivative < ActiveFedora::Base
 
   belongs_to :master_file, class_name: 'MasterFile', predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isDerivationOf
 
-  property :location_url, predicate: ::RDF::Vocab::EBUCore.locator, multiple: false do |index|
+  property :location_url, predicate: Avalon::RDFVocab::EBUCore.locator, multiple: false do |index|
     index.as :stored_sortable
   end
   property :hls_url, predicate: Avalon::RDFVocab::Derivative.hlsURL, multiple: false do |index|
@@ -31,12 +31,12 @@ class Derivative < ActiveFedora::Base
   property :duration, predicate: ::RDF::Vocab::EBUCore.duration, multiple: false do |index|
     index.as :stored_sortable
   end
-  property :track_id, predicate: ::RDF::Vocab::EBUCore.identifier, multiple: false
+  property :track_id, predicate: Avalon::RDFVocab::EBUCore.identifier, multiple: false
   property :hls_track_id, predicate: Avalon::RDFVocab::Derivative.hlsTrackID, multiple: false
   property :managed, predicate: Avalon::RDFVocab::Derivative.isManaged, multiple: false do |index|
     index.as ActiveFedora::Indexing::Descriptor.new(:boolean, :stored, :indexed)
   end
-  property :derivativeFile, predicate: ::RDF::Vocab::EBUCore.filename, multiple: false do |index|
+  property :derivativeFile, predicate: Avalon::RDFVocab::EBUCore.filename, multiple: false do |index|
     index.as :stored_sortable
   end
 
diff --git a/app/models/external_group.rb b/app/models/external_group.rb
index 63a503177e..4ab482f337 100644
--- a/app/models/external_group.rb
+++ b/app/models/external_group.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/ffmpeg_encode.rb b/app/models/ffmpeg_encode.rb
index 0faf51c1a0..892a64fc8b 100644
--- a/app/models/ffmpeg_encode.rb
+++ b/app/models/ffmpeg_encode.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/file_upload_step.rb b/app/models/file_upload_step.rb
index 3ff68c3614..162f13bbe7 100644
--- a/app/models/file_upload_step.rb
+++ b/app/models/file_upload_step.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/identity.rb b/app/models/identity.rb
index eb5f0ec7d0..76e9c4643a 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/iiif_canvas_presenter.rb b/app/models/iiif_canvas_presenter.rb
index 9cc8dad7dd..9325d24626 100644
--- a/app/models/iiif_canvas_presenter.rb
+++ b/app/models/iiif_canvas_presenter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -37,6 +37,15 @@ def display_content
     master_file.is_video? ? video_content : audio_content
   end
 
+  def sequence_rendering
+    [{
+      "@id" => "#{@master_file.waveform_master_file_url(@master_file.id)}.json",
+      "type" => "Dataset",
+      "label" => { "en" => ["waveform.json"] },
+      "format" => "application/json"
+    }]
+  end
+
   private
 
     def video_content
@@ -74,10 +83,10 @@ def stream_urls
       end
     end
 
-    def simple_iiif_range
+    def simple_iiif_range(label = stream_info[:embed_title])
       # TODO: embed_title?
       IiifManifestRange.new(
-        label: { '@none'.to_sym => [stream_info[:embed_title]] },
+        label: { "none" => [label] },
         items: [
           IiifCanvasPresenter.new(master_file: master_file, stream_info: stream_info, media_fragment: 't=0,')
         ]
@@ -97,12 +106,8 @@ def div_to_iiif_range(div_node)
         end
       end
 
-      # if a non-leaf node has no valid "Div" or "Span" children, then it would become empty range node containing no canvas
-      # raise an exception here as this error shall have been caught and handled by the parser and shall never happen here
-      raise Nokogiri::XML::SyntaxError, "Empty root or Div node: #{div_node[:label]}" if items.empty?
-
       IiifManifestRange.new(
-        label: { '@none' => [div_node[:label]] },
+        label: { "none" => [div_node[:label]] },
         items: items
       )
     end
@@ -110,7 +115,7 @@ def div_to_iiif_range(div_node)
     def span_to_iiif_range(span_node)
       fragment = "t=#{parse_hour_min_sec(span_node[:begin])},#{parse_hour_min_sec(span_node[:end])}"
       IiifManifestRange.new(
-        label: { '@none' => [span_node[:label]] },
+        label: { "none" => [span_node[:label]] },
         items: [
           IiifCanvasPresenter.new(master_file: master_file, stream_info: stream_info, media_fragment: fragment)
         ]
@@ -135,7 +140,11 @@ def structure_ng_xml
       # in which case SyntaxError shall be prompted to the user during file upload.
       # This can be done by defining some XML schema to require that at least one Div/Span child node exists
       # under root or each Div node, otherwise Nokogiri::XML parser will report error, and raise exception here.
-      @structure_ng_xml ||= (s = master_file.structuralMetadata.content).nil? ? Nokogiri::XML(nil) : Nokogiri::XML(s)
+      @structure_ng_xml ||= if master_file.has_structuralMetadata?
+                              Nokogiri::XML(master_file.structuralMetadata.content)
+                            else
+                              Nokogiri::XML(nil)
+                            end
     end
 
     def auth_service(quality)
diff --git a/app/models/iiif_manifest_presenter.rb b/app/models/iiif_manifest_presenter.rb
index cf5af4528c..a7bbd2a888 100644
--- a/app/models/iiif_manifest_presenter.rb
+++ b/app/models/iiif_manifest_presenter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/iiif_manifest_range.rb b/app/models/iiif_manifest_range.rb
index b9c5d850a8..59e01c01b7 100644
--- a/app/models/iiif_manifest_range.rb
+++ b/app/models/iiif_manifest_range.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/indexed_file.rb b/app/models/indexed_file.rb
index eafebaecfa..f6e3855801 100644
--- a/app/models/indexed_file.rb
+++ b/app/models/indexed_file.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/ingest_batch.rb b/app/models/ingest_batch.rb
index f442ef7b3b..16c1f04cc9 100644
--- a/app/models/ingest_batch.rb
+++ b/app/models/ingest_batch.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/language_term.rb b/app/models/language_term.rb
index fefa8485f7..63bdb4c2cd 100644
--- a/app/models/language_term.rb
+++ b/app/models/language_term.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -36,7 +36,7 @@ def autocomplete(query)
     end
 
     def load!
-      if File.exists?(Store)
+      if File.exist?(Store)
         YAML.load(File.read(Store))
       else
         harvest!
diff --git a/app/models/lease.rb b/app/models/lease.rb
index e3fa70c295..f3f8980c2b 100644
--- a/app/models/lease.rb
+++ b/app/models/lease.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/master_file.rb b/app/models/master_file.rb
index 3d1e3e4621..d76ae81e2e 100644
--- a/app/models/master_file.rb
+++ b/app/models/master_file.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -57,7 +57,7 @@ class MasterFile < ActiveFedora::Base
   property :title, predicate: ::RDF::Vocab::EBUCore.title, multiple: false do |index|
     index.as :stored_searchable
   end
-  property :file_location, predicate: ::RDF::Vocab::EBUCore.locator, multiple: false do |index|
+  property :file_location, predicate: Avalon::RDFVocab::EBUCore.locator, multiple: false do |index|
     index.as :stored_sortable
   end
   property :file_checksum, predicate: ::RDF::Vocab::NFO.hashValue, multiple: false do |index|
@@ -88,7 +88,7 @@ class MasterFile < ActiveFedora::Base
   property :physical_description, predicate: ::RDF::Vocab::EBUCore.hasFormat, multiple: false do |index|
     index.as :stored_sortable
   end
-  property :masterFile, predicate: ::RDF::Vocab::EBUCore.filename, multiple: false
+  property :masterFile, predicate: Avalon::RDFVocab::EBUCore.filename, multiple: false
   property :identifier, predicate: ::RDF::Vocab::Identifiers.local, multiple: true do |index|
     index.as :symbol
   end
@@ -165,6 +165,7 @@ def error
   before_destroy :stop_processing!
   before_destroy :update_parent!
   define_hooks :after_transcoding, :after_processing
+  after_update_index { |mf| mf.media_object&.enqueue_long_indexing }
 
   # Generate the waveform after proessing is complete but before master file management
   after_transcoding :generate_waveform
@@ -567,7 +568,7 @@ def find_frame_source(options={})
     response = { source: source&.location }.merge(options)
     return response if response[:source].to_s =~ %r(^https?://)
 
-    unless File.exists?(response[:source])
+    unless File.exist?(response[:source])
       Rails.logger.warn("Masterfile `#{file_location}` not found. Extracting via HLS.")
       hls_temp_file, new_offset = create_frame_source_hls_temp_file(options[:offset])
       response = { source: hls_temp_file, offset: new_offset, non_temp_file: false }
diff --git a/app/models/media_object.rb b/app/models/media_object.rb
index 44828314b2..8edc45bd48 100644
--- a/app/models/media_object.rb
+++ b/app/models/media_object.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -37,6 +37,7 @@ class MediaObject < ActiveFedora::Base
   before_save :assign_id!, prepend: true
   after_save :update_dependent_permalinks_job, if: Proc.new { |mo| mo.persisted? && mo.published? }
   after_save :remove_bookmarks
+  after_update_index :enqueue_long_indexing
 
   # Call custom validation methods to ensure that required fields are present and
   # that preferred controlled vocabulary standards are used
@@ -177,15 +178,15 @@ def report_missing_attributes
   end
 
   def set_media_types!
-    mime_types = master_files.reject {|mf| mf.file_location.blank? }.collect { |mf|
-      Rack::Mime.mime_type(File.extname(mf.file_location))
-    }.uniq
+    mime_types = master_file_solr_docs.reject { |mf| mf["file_location_ssi"].blank? }.collect do |mf|
+      Rack::Mime.mime_type(File.extname(mf["file_location_ssi"]))
+    end.uniq
     self.format = mime_types.empty? ? nil : mime_types
   end
 
   def set_resource_types!
-    self.avalon_resource_type = master_files.reject {|mf| mf.file_format.blank? }.collect{ |mf|
-      case mf.file_format
+    self.avalon_resource_type = master_file_solr_docs.reject { |mf| mf["file_format_ssi"].blank? }.collect do |mf|
+      case mf["file_format_ssi"]
       when 'Moving image'
         'moving image'
       when 'Sound'
@@ -193,10 +194,11 @@ def set_resource_types!
       else
         mf.file_format.downcase
       end
-    }.uniq
+    end.uniq
   end
 
   def update_dependent_properties!
+    @master_file_docs = nil
     self.set_duration!
     self.set_media_types!
     self.set_resource_types!
@@ -225,8 +227,26 @@ def section_physical_descriptions
     all_pds.uniq
   end
 
-  def to_solr
-    super.tap do |solr_doc|
+  # All fields that need to iterate over the master files do in this new method
+  # using a copy of the master file solr doc to avoid having to fetch them all from fedora
+  # this is probably okay since this is just aggregating the values already in the master file solr docs
+
+  def fill_in_solr_fields_that_need_master_files(solr_doc)
+    solr_doc['section_id_ssim'] = ordered_master_file_ids
+    solr_doc["other_identifier_sim"] +=  master_files.collect {|mf| mf.identifier.to_a }.flatten
+    solr_doc["date_digitized_sim"] = master_files.collect {|mf| mf.date_digitized }.compact.map {|t| Time.parse(t).strftime "%F" }
+    solr_doc["section_label_tesim"] = section_labels
+    solr_doc['section_physical_description_ssim'] = section_physical_descriptions
+    solr_doc['all_comments_sim'] = all_comments
+  end
+
+  # Enqueue background job to do a full indexing including more costly fields that read from children
+  def enqueue_long_indexing
+    MediaObjectIndexingJob.perform_later(id)
+  end
+
+  def to_solr(include_child_fields: false)
+    descMetadata.to_solr(super).tap do |solr_doc|
       solr_doc[ActiveFedora.index_field_mapper.solr_name("workflow_published", :facetable, type: :string)] = published? ? 'Published' : 'Unpublished'
       solr_doc[ActiveFedora.index_field_mapper.solr_name("collection", :symbol, type: :string)] = collection.name if collection.present?
       solr_doc[ActiveFedora.index_field_mapper.solr_name("unit", :symbol, type: :string)] = collection.unit if collection.present?
@@ -236,17 +256,17 @@ def to_solr
       solr_doc[Hydra.config.permissions.read.group] += solr_doc['read_access_ip_group_ssim']
       solr_doc["title_ssort"] = self.title
       solr_doc["creator_ssort"] = Array(self.creator).join(', ')
-      solr_doc["date_digitized_sim"] = master_files.collect {|mf| mf.date_digitized }.compact.map {|t| Time.parse(t).strftime "%F" }
       solr_doc["date_ingested_sim"] = self.create_date.strftime "%F" if self.create_date.present?
-      #include identifiers for parts
-      solr_doc["other_identifier_sim"] +=  master_files.collect {|mf| mf.identifier.to_a }.flatten
-      #include labels for parts and their structural metadata
-      solr_doc['section_id_ssim'] = ordered_master_file_ids
-      solr_doc["section_label_tesim"] = section_labels
-      solr_doc['section_physical_description_ssim'] = section_physical_descriptions
       solr_doc['avalon_resource_type_ssim'] = self.avalon_resource_type.map(&:titleize)
       solr_doc['identifier_ssim'] = self.identifier.map(&:downcase)
-      solr_doc['all_comments_sim'] = all_comments
+      if include_child_fields
+        fill_in_solr_fields_that_need_master_files(solr_doc)
+      elsif id.present? # avoid error in test suite
+        # Fill in other identifier so these values aren't stripped from the solr doc while waiting for the background job
+        mf_docs = ActiveFedora::SolrService.query("isPartOf_ssim:#{id}", rows: 1_000_000)
+        solr_doc["other_identifier_sim"] +=  mf_docs.collect { |h| h['identifier_ssim'] }.flatten
+      end
+
       #Add all searchable fields to the all_text_timv field
       all_text_values = []
       all_text_values << solr_doc["title_tesi"]
@@ -394,10 +414,20 @@ def current_checkout(user_id)
     checkouts.select{ |ch| ch.user_id == user_id  }.first
   end
 
+  # Override to reset memoized fields
+  def reload
+    @master_file_docs = nil
+    super
+  end
+
   private
 
+    def master_file_solr_docs
+      @master_file_docs ||= ActiveFedora::SolrService.query("isPartOf_ssim:#{id}", rows: 1_000_000)
+    end
+
     def calculate_duration
-      self.master_files.map{|mf| mf.duration.to_i }.compact.sum
+      master_file_solr_docs.collect { |h| h['duration_ssi'].to_i }.compact.sum
     end
 
     def collect_ips_for_index ip_strings
diff --git a/app/models/migration_status.rb b/app/models/migration_status.rb
index 0b4f5456b6..4cb3ebda6a 100644
--- a/app/models/migration_status.rb
+++ b/app/models/migration_status.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/mods_behaviors.rb b/app/models/mods_behaviors.rb
index ec4fa58136..ee3cc03cf2 100644
--- a/app/models/mods_behaviors.rb
+++ b/app/models/mods_behaviors.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/mods_document.rb b/app/models/mods_document.rb
index ea211d6e54..07dec3da75 100644
--- a/app/models/mods_document.rb
+++ b/app/models/mods_document.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/mods_templates.rb b/app/models/mods_templates.rb
index 4875c320ab..3ee3c627fe 100644
--- a/app/models/mods_templates.rb
+++ b/app/models/mods_templates.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/pass_through_encode.rb b/app/models/pass_through_encode.rb
index 24d959c5f7..b47fad6397 100644
--- a/app/models/pass_through_encode.rb
+++ b/app/models/pass_through_encode.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/playlist.rb b/app/models/playlist.rb
index 7b4fb10d41..3b955f490e 100644
--- a/app/models/playlist.rb
+++ b/app/models/playlist.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/playlist_item.rb b/app/models/playlist_item.rb
index f0225f2846..366d3e412a 100644
--- a/app/models/playlist_item.rb
+++ b/app/models/playlist_item.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/preview_step.rb b/app/models/preview_step.rb
index 346d80965f..aeb984cfbe 100644
--- a/app/models/preview_step.rb
+++ b/app/models/preview_step.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/resource_description_step.rb b/app/models/resource_description_step.rb
index 25528c7e29..f837b3c4b9 100644
--- a/app/models/resource_description_step.rb
+++ b/app/models/resource_description_step.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/role_map.rb b/app/models/role_map.rb
index 86649b8eb9..4ed4813dfb 100644
--- a/app/models/role_map.rb
+++ b/app/models/role_map.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb
index ceca0e6915..ee7f12bc9b 100644
--- a/app/models/search_builder.rb
+++ b/app/models/search_builder.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/models/security_handler.rb b/app/models/security_handler.rb
index f749ac8947..ca5e8794be 100644
--- a/app/models/security_handler.rb
+++ b/app/models/security_handler.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index ca7d22f1ed..ac16ab407f 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/stream_token.rb b/app/models/stream_token.rb
index 99f95e120f..c399ec3ecb 100644
--- a/app/models/stream_token.rb
+++ b/app/models/stream_token.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/models/structural_metadata.rb b/app/models/structural_metadata.rb
index 91a3a8c2e6..9b75b9dcb8 100644
--- a/app/models/structural_metadata.rb
+++ b/app/models/structural_metadata.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/structure_step.rb b/app/models/structure_step.rb
index 6ec800a00e..3229cc4110 100644
--- a/app/models/structure_step.rb
+++ b/app/models/structure_step.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/supplemental_file.rb b/app/models/supplemental_file.rb
index ae6d6233f9..178d3afe77 100644
--- a/app/models/supplemental_file.rb
+++ b/app/models/supplemental_file.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/timeline.rb b/app/models/timeline.rb
index 4447fc4293..9b170275d6 100644
--- a/app/models/timeline.rb
+++ b/app/models/timeline.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/models/user.rb b/app/models/user.rb
index 895b7b36ab..6fa11c9b99 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/models/watched_encode.rb b/app/models/watched_encode.rb
index 2f9b5c59cd..277a2d2dbf 100644
--- a/app/models/watched_encode.rb
+++ b/app/models/watched_encode.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/admin/collection_presenter.rb b/app/presenters/admin/collection_presenter.rb
index c7f83f7fe8..f770fe52af 100644
--- a/app/presenters/admin/collection_presenter.rb
+++ b/app/presenters/admin/collection_presenter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/collection_presenter.rb b/app/presenters/collection_presenter.rb
index 4b5b7530ef..f8cc605413 100644
--- a/app/presenters/collection_presenter.rb
+++ b/app/presenters/collection_presenter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/encode_presenter.rb b/app/presenters/encode_presenter.rb
index 4465cad932..703473bcbf 100644
--- a/app/presenters/encode_presenter.rb
+++ b/app/presenters/encode_presenter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/speedy_af/proxy/admin/collection.rb b/app/presenters/speedy_af/proxy/admin/collection.rb
index d4b4ce309e..b57434d9ba 100644
--- a/app/presenters/speedy_af/proxy/admin/collection.rb
+++ b/app/presenters/speedy_af/proxy/admin/collection.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/speedy_af/proxy/derivative.rb b/app/presenters/speedy_af/proxy/derivative.rb
new file mode 100644
index 0000000000..7546dcc814
--- /dev/null
+++ b/app/presenters/speedy_af/proxy/derivative.rb
@@ -0,0 +1,21 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
+class SpeedyAF::Proxy::Derivative < SpeedyAF::Base
+  self.defaults = { video_bitrate: nil, video_codec: nil, mime_type: nil }
+
+  def bitrate
+    audio_bitrate.to_i + video_bitrate.to_i
+  end
+end
diff --git a/app/presenters/speedy_af/proxy/master_file.rb b/app/presenters/speedy_af/proxy/master_file.rb
index e7784af2cb..386336953d 100644
--- a/app/presenters/speedy_af/proxy/master_file.rb
+++ b/app/presenters/speedy_af/proxy/master_file.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/speedy_af/proxy/media_object.rb b/app/presenters/speedy_af/proxy/media_object.rb
index ab586b9bbc..614152a74b 100644
--- a/app/presenters/speedy_af/proxy/media_object.rb
+++ b/app/presenters/speedy_af/proxy/media_object.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/presenters/speedy_af/proxy/structural_metadata.rb b/app/presenters/speedy_af/proxy/structural_metadata.rb
index cc12f68961..f3d24e71c4 100644
--- a/app/presenters/speedy_af/proxy/structural_metadata.rb
+++ b/app/presenters/speedy_af/proxy/structural_metadata.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/services/file_locator.rb b/app/services/file_locator.rb
index 1708358076..54e1e0c569 100644
--- a/app/services/file_locator.rb
+++ b/app/services/file_locator.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/services/master_file_builder.rb b/app/services/master_file_builder.rb
index e1fc94bbf2..bd48b43444 100644
--- a/app/services/master_file_builder.rb
+++ b/app/services/master_file_builder.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/services/security_service.rb b/app/services/security_service.rb
index c512a45118..4d6b76b97e 100644
--- a/app/services/security_service.rb
+++ b/app/services/security_service.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/app/services/solr_collection_admin.rb b/app/services/solr_collection_admin.rb
index 73e6254384..53519cbab8 100644
--- a/app/services/solr_collection_admin.rb
+++ b/app/services/solr_collection_admin.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/services/solr_collection_creator.rb b/app/services/solr_collection_creator.rb
index 529942b778..2a9b2fa2ea 100644
--- a/app/services/solr_collection_creator.rb
+++ b/app/services/solr_collection_creator.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/services/waveform_service.rb b/app/services/waveform_service.rb
index 892dfb0bd4..87bf904b5d 100644
--- a/app/services/waveform_service.rb
+++ b/app/services/waveform_service.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -88,7 +88,8 @@ def get_normalized_peaks(uri)
   def get_wave_io(uri)
     headers = "-headers $'Referer: #{Rails.application.routes.url_helpers.root_url}\r\n'" if uri.starts_with? "http"
     normalized_uri = uri.starts_with?("file") ? Addressable::URI.unencode(uri) : uri
-    cmd = "#{Settings.ffmpeg.path} #{headers} -i '#{normalized_uri}' -f wav -ar 44100 - 2> /dev/null"
+    timeout = 3600000000 # Must be in microseconds. Current value = 1 hour.
+    cmd = "#{Settings.ffmpeg.path} #{headers} -rw_timeout #{timeout} -i '#{normalized_uri}' -f wav -ar 44100 - 2> /dev/null"
     IO.popen(cmd)
   end
 
diff --git a/app/validators/array_inclusion_validator.rb b/app/validators/array_inclusion_validator.rb
index 854192741b..f293eb5cf8 100644
--- a/app/validators/array_inclusion_validator.rb
+++ b/app/validators/array_inclusion_validator.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/validators/uniqueness_validator.rb b/app/validators/uniqueness_validator.rb
index 3b71df5166..48e4f2bd8d 100644
--- a/app/validators/uniqueness_validator.rb
+++ b/app/validators/uniqueness_validator.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
index b22abeaf2f..66f96a2145 100644
--- a/app/views/_user_util_links.html.erb
+++ b/app/views/_user_util_links.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/collections/_apply_access_control.html.erb b/app/views/admin/collections/_apply_access_control.html.erb
index c5053f6de8..c8dcbd255e 100644
--- a/app/views/admin/collections/_apply_access_control.html.erb
+++ b/app/views/admin/collections/_apply_access_control.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/collections/_form.html.erb b/app/views/admin/collections/_form.html.erb
index 5f8a56344c..1ed818c730 100644
--- a/app/views/admin/collections/_form.html.erb
+++ b/app/views/admin/collections/_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/collections/index.html.erb b/app/views/admin/collections/index.html.erb
index 61f3d8644c..20499255d8 100644
--- a/app/views/admin/collections/index.html.erb
+++ b/app/views/admin/collections/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/collections/new.html.erb b/app/views/admin/collections/new.html.erb
index 7d7826e996..84e74d0d9c 100644
--- a/app/views/admin/collections/new.html.erb
+++ b/app/views/admin/collections/new.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/collections/remove.html.erb b/app/views/admin/collections/remove.html.erb
index ae98f4c9aa..1f82e4b903 100644
--- a/app/views/admin/collections/remove.html.erb
+++ b/app/views/admin/collections/remove.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/collections/show.html.erb b/app/views/admin/collections/show.html.erb
index de015cbc4d..6adcc862d4 100644
--- a/app/views/admin/collections/show.html.erb
+++ b/app/views/admin/collections/show.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/groups/_form.html.erb b/app/views/admin/groups/_form.html.erb
index 4f0ce56e9a..4c7f6ca471 100644
--- a/app/views/admin/groups/_form.html.erb
+++ b/app/views/admin/groups/_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/groups/edit.html.erb b/app/views/admin/groups/edit.html.erb
index 39c6c655fa..d5ecf315ae 100644
--- a/app/views/admin/groups/edit.html.erb
+++ b/app/views/admin/groups/edit.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/admin/groups/index.html.erb b/app/views/admin/groups/index.html.erb
index ccc1a77cec..7ddd4a63c3 100644
--- a/app/views/admin/groups/index.html.erb
+++ b/app/views/admin/groups/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/batch_registries_mailer/_batch_encoding_entry_row.html.erb b/app/views/batch_registries_mailer/_batch_encoding_entry_row.html.erb
index 10bd04cfc0..2584cf2ac7 100644
--- a/app/views/batch_registries_mailer/_batch_encoding_entry_row.html.erb
+++ b/app/views/batch_registries_mailer/_batch_encoding_entry_row.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/batch_registries_mailer/batch_encoding_finished.html.erb b/app/views/batch_registries_mailer/batch_encoding_finished.html.erb
index 998ec629c7..f82f134eeb 100644
--- a/app/views/batch_registries_mailer/batch_encoding_finished.html.erb
+++ b/app/views/batch_registries_mailer/batch_encoding_finished.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/batch_registries_mailer/batch_ingest_validation_error.html.erb b/app/views/batch_registries_mailer/batch_ingest_validation_error.html.erb
index 9eb9587a2d..8b811f0da1 100644
--- a/app/views/batch_registries_mailer/batch_ingest_validation_error.html.erb
+++ b/app/views/batch_registries_mailer/batch_ingest_validation_error.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/batch_registries_mailer/batch_ingest_validation_success.html.erb b/app/views/batch_registries_mailer/batch_ingest_validation_success.html.erb
index f701ebe2e7..c5f47a054f 100644
--- a/app/views/batch_registries_mailer/batch_ingest_validation_success.html.erb
+++ b/app/views/batch_registries_mailer/batch_ingest_validation_success.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/batch_registries_mailer/batch_registration_finished_mailer.html.erb b/app/views/batch_registries_mailer/batch_registration_finished_mailer.html.erb
index b51eeb4054..dd1077b824 100644
--- a/app/views/batch_registries_mailer/batch_registration_finished_mailer.html.erb
+++ b/app/views/batch_registries_mailer/batch_registration_finished_mailer.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/batch_registries_mailer/batch_registration_stalled_mailer.html.erb b/app/views/batch_registries_mailer/batch_registration_stalled_mailer.html.erb
index 9927b53157..a7e10bdc78 100644
--- a/app/views/batch_registries_mailer/batch_registration_stalled_mailer.html.erb
+++ b/app/views/batch_registries_mailer/batch_registration_stalled_mailer.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/_document_action.html.erb b/app/views/bookmarks/_document_action.html.erb
index f96591867f..af16f05e27 100644
--- a/app/views/bookmarks/_document_action.html.erb
+++ b/app/views/bookmarks/_document_action.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/_formless_document_action.html.erb b/app/views/bookmarks/_formless_document_action.html.erb
index da78dcc72e..92504bd5b7 100644
--- a/app/views/bookmarks/_formless_document_action.html.erb
+++ b/app/views/bookmarks/_formless_document_action.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/add_to_playlist.html.erb b/app/views/bookmarks/add_to_playlist.html.erb
index d654ec3f52..131e099a0e 100644
--- a/app/views/bookmarks/add_to_playlist.html.erb
+++ b/app/views/bookmarks/add_to_playlist.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/delete.html.erb b/app/views/bookmarks/delete.html.erb
index 00e79fdee8..6a104ba5b7 100644
--- a/app/views/bookmarks/delete.html.erb
+++ b/app/views/bookmarks/delete.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb
index 33fc7701fc..7e692f45d5 100644
--- a/app/views/bookmarks/index.html.erb
+++ b/app/views/bookmarks/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/intercom_push.html.erb b/app/views/bookmarks/intercom_push.html.erb
index ec8f21e335..8c59c4a2f7 100644
--- a/app/views/bookmarks/intercom_push.html.erb
+++ b/app/views/bookmarks/intercom_push.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/merge.html.erb b/app/views/bookmarks/merge.html.erb
index a4d8350460..51440f3894 100644
--- a/app/views/bookmarks/merge.html.erb
+++ b/app/views/bookmarks/merge.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/move.html.erb b/app/views/bookmarks/move.html.erb
index b1b98925eb..fc2a3cdf32 100644
--- a/app/views/bookmarks/move.html.erb
+++ b/app/views/bookmarks/move.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/bookmarks/update_access_control.html.erb b/app/views/bookmarks/update_access_control.html.erb
index d9afaf7225..cefc121221 100644
--- a/app/views/bookmarks/update_access_control.html.erb
+++ b/app/views/bookmarks/update_access_control.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_document_list.html.erb b/app/views/catalog/_document_list.html.erb
index e231c7773a..364a52756f 100644
--- a/app/views/catalog/_document_list.html.erb
+++ b/app/views/catalog/_document_list.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_facet_group.html.erb b/app/views/catalog/_facet_group.html.erb
index 98b0e580ee..b7dd101937 100644
--- a/app/views/catalog/_facet_group.html.erb
+++ b/app/views/catalog/_facet_group.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_facet_pagination.html.erb b/app/views/catalog/_facet_pagination.html.erb
index 733294cf7a..f416bf4412 100644
--- a/app/views/catalog/_facet_pagination.html.erb
+++ b/app/views/catalog/_facet_pagination.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_facets.html.erb b/app/views/catalog/_facets.html.erb
index 12eb601b90..4608793e0b 100644
--- a/app/views/catalog/_facets.html.erb
+++ b/app/views/catalog/_facets.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb
index c2ec65c15d..e29807dd7d 100644
--- a/app/views/catalog/_home_text.html.erb
+++ b/app/views/catalog/_home_text.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_index_header_media_object.html.erb b/app/views/catalog/_index_header_media_object.html.erb
index 4d823f4e75..40132650ee 100644
--- a/app/views/catalog/_index_header_media_object.html.erb
+++ b/app/views/catalog/_index_header_media_object.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_index_media_object.html.erb b/app/views/catalog/_index_media_object.html.erb
index e689592c67..1751f1381d 100644
--- a/app/views/catalog/_index_media_object.html.erb
+++ b/app/views/catalog/_index_media_object.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_select_all.html.erb b/app/views/catalog/_select_all.html.erb
index 6a7fc1e382..0b5682f70d 100644
--- a/app/views/catalog/_select_all.html.erb
+++ b/app/views/catalog/_select_all.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/catalog/_thumbnail_media_object.html.erb b/app/views/catalog/_thumbnail_media_object.html.erb
index ee30cf801c..bc463ad6e6 100644
--- a/app/views/catalog/_thumbnail_media_object.html.erb
+++ b/app/views/catalog/_thumbnail_media_object.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
@@ -20,6 +20,6 @@ Unless required by applicable law or agreed to in writing, software distributed
       <%= image_tag( image_url ) %>
     <% end %>
   <% else %>
-    <%= image_tag 'no_icon.png', class: 'result-thumbnail' %>
+    <%= image_tag 'no_icon.png', class: 'result-thumbnail no-icon' %>
   <% end %>
 </div>
diff --git a/app/views/catalog/index.html.erb b/app/views/catalog/index.html.erb
index 448992f0fe..8335942daf 100644
--- a/app/views/catalog/index.html.erb
+++ b/app/views/catalog/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/checkouts/_inactive_checkout.html.erb b/app/views/checkouts/_inactive_checkout.html.erb
index bd5f2add61..3438392923 100644
--- a/app/views/checkouts/_inactive_checkout.html.erb
+++ b/app/views/checkouts/_inactive_checkout.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/checkouts/index.html.erb b/app/views/checkouts/index.html.erb
index 19a887ef45..279804b401 100644
--- a/app/views/checkouts/index.html.erb
+++ b/app/views/checkouts/index.html.erb
@@ -1,3 +1,18 @@
+<%#
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+  University.  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+  under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+  CONDITIONS OF ANY KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations under the License.
+---  END LICENSE_HEADER BLOCK  ---
+%>
 <h1>Checkouts</h1>
 
 <div class="Checkout-index">
diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb
index e2745fefdf..79b7a3c185 100644
--- a/app/views/collections/index.html.erb
+++ b/app/views/collections/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 25a633ad81..acc5024f4c 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/comments/create.html.erb b/app/views/comments/create.html.erb
index 227f9a4663..7a39f91bf2 100644
--- a/app/views/comments/create.html.erb
+++ b/app/views/comments/create.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
index 0950272022..f0ed402d87 100644
--- a/app/views/comments/index.html.erb
+++ b/app/views/comments/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/comments_mailer/contact_email.html.erb b/app/views/comments_mailer/contact_email.html.erb
index 1d688b8833..a48f827138 100644
--- a/app/views/comments_mailer/contact_email.html.erb
+++ b/app/views/comments_mailer/contact_email.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/comments_mailer/contact_email.text.erb b/app/views/comments_mailer/contact_email.text.erb
index b87e63f0ce..8051a305cc 100644
--- a/app/views/comments_mailer/contact_email.text.erb
+++ b/app/views/comments_mailer/contact_email.text.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index a6816a610a..83b2270432 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 3e6e27ae4b..75d660035f 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 1920f3ff6e..57385ac0bb 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index ecdbcc6860..b5f6953b23 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 726a9ec96d..5ab8576ef9 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb
index 355aade066..d45119c9d0 100644
--- a/app/views/devise/shared/_error_messages.html.erb
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -1,3 +1,18 @@
+<%#
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+  University.  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+  under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+  CONDITIONS OF ANY KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations under the License.
+---  END LICENSE_HEADER BLOCK  ---
+%>
 <% if resource.errors.any? %>
   <div class="panel-body">
     <div id="error_explanation" class="alert alert-danger">
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
index 1aadc9eaf7..3e251367ff 100644
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/encode_records/index.html.erb b/app/views/encode_records/index.html.erb
index 7d3abe93d7..6db5ba271f 100644
--- a/app/views/encode_records/index.html.erb
+++ b/app/views/encode_records/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/encode_records/show.html.erb b/app/views/encode_records/show.html.erb
index 4a7f8dc3da..c8d80425a1 100644
--- a/app/views/encode_records/show.html.erb
+++ b/app/views/encode_records/show.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/errors/deleted_pid.html.erb b/app/views/errors/deleted_pid.html.erb
index f0bf32c733..bb53dc4237 100644
--- a/app/views/errors/deleted_pid.html.erb
+++ b/app/views/errors/deleted_pid.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/errors/restricted_pid.html.erb b/app/views/errors/restricted_pid.html.erb
index a011b04577..4b741a5341 100644
--- a/app/views/errors/restricted_pid.html.erb
+++ b/app/views/errors/restricted_pid.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/errors/unknown_pid.html.erb b/app/views/errors/unknown_pid.html.erb
index 706e3a5620..3aad424fe1 100644
--- a/app/views/errors/unknown_pid.html.erb
+++ b/app/views/errors/unknown_pid.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/ingest_batch_mailer/batch_ingest_validation_error.html.erb b/app/views/ingest_batch_mailer/batch_ingest_validation_error.html.erb
index 35e5818f37..5fafeb7da9 100644
--- a/app/views/ingest_batch_mailer/batch_ingest_validation_error.html.erb
+++ b/app/views/ingest_batch_mailer/batch_ingest_validation_error.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/ingest_batch_mailer/batch_ingest_validation_success.html.erb b/app/views/ingest_batch_mailer/batch_ingest_validation_success.html.erb
index ace811ba1f..48f35f9e45 100644
--- a/app/views/ingest_batch_mailer/batch_ingest_validation_success.html.erb
+++ b/app/views/ingest_batch_mailer/batch_ingest_validation_success.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/ingest_batch_mailer/status_email.html.erb b/app/views/ingest_batch_mailer/status_email.html.erb
index 257ae90bc4..51eb8e861e 100644
--- a/app/views/ingest_batch_mailer/status_email.html.erb
+++ b/app/views/ingest_batch_mailer/status_email.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/layouts/avalon.html.erb b/app/views/layouts/avalon.html.erb
index 17135b46d2..495daeb952 100644
--- a/app/views/layouts/avalon.html.erb
+++ b/app/views/layouts/avalon.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/layouts/embed.html.erb b/app/views/layouts/embed.html.erb
index 38c4114d83..5dec3d0f55 100644
--- a/app/views/layouts/embed.html.erb
+++ b/app/views/layouts/embed.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 94931376da..a06158e806 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/_authenticate.html.erb b/app/views/master_files/_authenticate.html.erb
index c092402171..bb36f437b1 100644
--- a/app/views/master_files/_authenticate.html.erb
+++ b/app/views/master_files/_authenticate.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/_authorize.html.erb b/app/views/master_files/_authorize.html.erb
index a240044779..821635e9cb 100644
--- a/app/views/master_files/_authorize.html.erb
+++ b/app/views/master_files/_authorize.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/_cdl_embed.html.erb b/app/views/master_files/_cdl_embed.html.erb
index c10ac27775..79f118395b 100644
--- a/app/views/master_files/_cdl_embed.html.erb
+++ b/app/views/master_files/_cdl_embed.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/_mejs4_player_js.html.erb b/app/views/master_files/_mejs4_player_js.html.erb
index 8070e6d0ac..ab73486d6b 100644
--- a/app/views/master_files/_mejs4_player_js.html.erb
+++ b/app/views/master_files/_mejs4_player_js.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/_player.html.erb b/app/views/master_files/_player.html.erb
index c50215bf76..ba72aa3281 100644
--- a/app/views/master_files/_player.html.erb
+++ b/app/views/master_files/_player.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/caption_manifest.m3u8.erb b/app/views/master_files/caption_manifest.m3u8.erb
new file mode 100644
index 0000000000..2f5b5cf8e7
--- /dev/null
+++ b/app/views/master_files/caption_manifest.m3u8.erb
@@ -0,0 +1,23 @@
+<%#
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+  University.  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+  under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+  CONDITIONS OF ANY KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations under the License.
+---  END LICENSE_HEADER BLOCK  ---
+%>
+#EXTM3U
+#EXT-X-TARGETDURATION:<%= @master_file.duration %>
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:<%= @master_file.duration %>
+<%= captions_master_file_path %>
+#EXT-X-ENDLIST
diff --git a/app/views/master_files/embed.html.erb b/app/views/master_files/embed.html.erb
index 951ece93c2..28bca38205 100644
--- a/app/views/master_files/embed.html.erb
+++ b/app/views/master_files/embed.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/master_files/hls_manifest.m3u8.erb b/app/views/master_files/hls_manifest.m3u8.erb
index e574584381..09640661d3 100644
--- a/app/views/master_files/hls_manifest.m3u8.erb
+++ b/app/views/master_files/hls_manifest.m3u8.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
@@ -14,7 +14,15 @@ Unless required by applicable law or agreed to in writing, software distributed
 ---  END LICENSE_HEADER BLOCK  ---
 %>
 #EXTM3U
+<% if @master_file.has_captions? %>
+#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",LANGUAGE="<%= Settings.caption_default.language %>",NAME="<%= Settings.caption_default.name %>",AUTOSELECT=YES,URI="<%= caption_manifest_master_file_path %>"
+<% @hls_streams.each do |hls| %>
+#EXT-X-STREAM-INF:BANDWIDTH=<%= hls[:bitrate] %>,SUBTITLES="subs"
+<%= hls[:url] %>
+<% end %>
+<% else %>
 <% @hls_streams.each do |hls| %>
 #EXT-X-STREAM-INF:BANDWIDTH=<%= hls[:bitrate] %>
 <%= hls[:url] %>
 <% end %>
+<% end %>
diff --git a/app/views/master_files/iiif_auth_token.html.erb b/app/views/master_files/iiif_auth_token.html.erb
index 514d02e5f3..49f0bde8db 100644
--- a/app/views/master_files/iiif_auth_token.html.erb
+++ b/app/views/master_files/iiif_auth_token.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_access_control.html.erb b/app/views/media_objects/_access_control.html.erb
index 57ab2e21f3..f1e15419c4 100644
--- a/app/views/media_objects/_access_control.html.erb
+++ b/app/views/media_objects/_access_control.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_add_to_playlist_form.html.erb b/app/views/media_objects/_add_to_playlist_form.html.erb
index 508cb0388a..57e50129a0 100644
--- a/app/views/media_objects/_add_to_playlist_form.html.erb
+++ b/app/views/media_objects/_add_to_playlist_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_administrative_links.html.erb b/app/views/media_objects/_administrative_links.html.erb
index 5865582148..c244c48fa6 100644
--- a/app/views/media_objects/_administrative_links.html.erb
+++ b/app/views/media_objects/_administrative_links.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_checkout.html.erb b/app/views/media_objects/_checkout.html.erb
index 25e965ec3b..a0f8e154b4 100644
--- a/app/views/media_objects/_checkout.html.erb
+++ b/app/views/media_objects/_checkout.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_checkout_authenticate.html.erb b/app/views/media_objects/_checkout_authenticate.html.erb
index 2b706f9813..1676ae3641 100644
--- a/app/views/media_objects/_checkout_authenticate.html.erb
+++ b/app/views/media_objects/_checkout_authenticate.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_destroy_checkout.html.erb b/app/views/media_objects/_destroy_checkout.html.erb
index 55d7e917e4..192f768e5f 100644
--- a/app/views/media_objects/_destroy_checkout.html.erb
+++ b/app/views/media_objects/_destroy_checkout.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_dropbox_details.html.erb b/app/views/media_objects/_dropbox_details.html.erb
index 9bd277ea15..68b2926e22 100644
--- a/app/views/media_objects/_dropbox_details.html.erb
+++ b/app/views/media_objects/_dropbox_details.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_dropbox_empty_container.html.erb b/app/views/media_objects/_dropbox_empty_container.html.erb
index fb7a6a833b..f3a3120daf 100644
--- a/app/views/media_objects/_dropbox_empty_container.html.erb
+++ b/app/views/media_objects/_dropbox_empty_container.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_dropbox_file_entry.html.erb b/app/views/media_objects/_dropbox_file_entry.html.erb
index 7fa68fb199..8da33b9381 100644
--- a/app/views/media_objects/_dropbox_file_entry.html.erb
+++ b/app/views/media_objects/_dropbox_file_entry.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_dropbox_file_navigator.html.erb b/app/views/media_objects/_dropbox_file_navigator.html.erb
index 975bf1ec25..151f7ab7a2 100644
--- a/app/views/media_objects/_dropbox_file_navigator.html.erb
+++ b/app/views/media_objects/_dropbox_file_navigator.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_dropdown_field.html.erb b/app/views/media_objects/_dropdown_field.html.erb
index 471fab0fc4..45cdbf417f 100644
--- a/app/views/media_objects/_dropdown_field.html.erb
+++ b/app/views/media_objects/_dropdown_field.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_embed_checkout.html.erb b/app/views/media_objects/_embed_checkout.html.erb
index f637d79392..72aa9756e9 100644
--- a/app/views/media_objects/_embed_checkout.html.erb
+++ b/app/views/media_objects/_embed_checkout.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_embed_resource.html.erb b/app/views/media_objects/_embed_resource.html.erb
index 2f906a7b04..01e581dd7c 100644
--- a/app/views/media_objects/_embed_resource.html.erb
+++ b/app/views/media_objects/_embed_resource.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_file_upload.html.erb b/app/views/media_objects/_file_upload.html.erb
index 36005022bb..2cff27d691 100644
--- a/app/views/media_objects/_file_upload.html.erb
+++ b/app/views/media_objects/_file_upload.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
@@ -60,10 +60,10 @@ Unless required by applicable law or agreed to in writing, software distributed
                     <% end %>
                   </span>
                   <% filename = section.title || File.basename(section.file_location.to_s) %>
-                  <span class="mediaobject-filename" id= <%= "truncated_#{section.id}" %> title=<%= filename %>>
-                    <%= section.title || truncate_center(File.basename(section.file_location.to_s), 30, 10) %>
+                  <span class="mediaobject-filename" id= <%= "truncated_#{section.id}" %> title="<%= filename %>">
+                    <%= truncate_center(filename, 30, 10) %>
                   </span>
-                  <span class="mediaobject-filename" id= <%= "full_#{section.id}" %> style="display: none;" title=<%= filename %>>
+                  <span class="mediaobject-filename" id= <%= "full_#{section.id}" %> style="display: none;" title="<%= filename %>">
                     <%= filename %>
                   </span>
                   <span><%= number_to_human_size(section.file_size) %></span>
diff --git a/app/views/media_objects/_ingest_step.html.erb b/app/views/media_objects/_ingest_step.html.erb
index 6b87f60e09..eb55e16291 100644
--- a/app/views/media_objects/_ingest_step.html.erb
+++ b/app/views/media_objects/_ingest_step.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_ingest_steps.html.erb b/app/views/media_objects/_ingest_steps.html.erb
index f926094c83..d755b00e7b 100644
--- a/app/views/media_objects/_ingest_steps.html.erb
+++ b/app/views/media_objects/_ingest_steps.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_intercom_push_form.html.erb b/app/views/media_objects/_intercom_push_form.html.erb
index dab2558905..a63fe824ef 100644
--- a/app/views/media_objects/_intercom_push_form.html.erb
+++ b/app/views/media_objects/_intercom_push_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_intercom_push_modal.html.erb b/app/views/media_objects/_intercom_push_modal.html.erb
index 0c6a4fc815..a4731a4a6c 100644
--- a/app/views/media_objects/_intercom_push_modal.html.erb
+++ b/app/views/media_objects/_intercom_push_modal.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_item_view.html.erb b/app/views/media_objects/_item_view.html.erb
index 7b07f83256..9f15f70b3e 100644
--- a/app/views/media_objects/_item_view.html.erb
+++ b/app/views/media_objects/_item_view.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
@@ -70,7 +70,7 @@ Unless required by applicable law or agreed to in writing, software distributed
     // When viewing video on smaller devices scroll to page content to fully
     // display the video player
     $(document).ready(function () {
-      const isVideo = "<%= @currentStreamInfo[:is_video] %>";
+      const isVideo = <%= @currentStreamInfo[:is_video] %>;
       if(isVideo) {
         const screenHeight = screen.height;
         const playerHeight = document.getElementsByTagName('video')[0].style.height.replace(/[^-\d\.]/g, '');
diff --git a/app/views/media_objects/_lti_url.html.erb b/app/views/media_objects/_lti_url.html.erb
index 4967a07e8e..812c207107 100644
--- a/app/views/media_objects/_lti_url.html.erb
+++ b/app/views/media_objects/_lti_url.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_mejs4_add_to_playlist.html.erb b/app/views/media_objects/_mejs4_add_to_playlist.html.erb
index 591a7b83f3..f9d975056f 100644
--- a/app/views/media_objects/_mejs4_add_to_playlist.html.erb
+++ b/app/views/media_objects/_mejs4_add_to_playlist.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_mejs4_player_js.html.erb b/app/views/media_objects/_mejs4_player_js.html.erb
index 3354e2650f..f9a13ba131 100644
--- a/app/views/media_objects/_mejs4_player_js.html.erb
+++ b/app/views/media_objects/_mejs4_player_js.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_metadata_display.html.erb b/app/views/media_objects/_metadata_display.html.erb
index 02ee1c5e66..6a66bdaca9 100644
--- a/app/views/media_objects/_metadata_display.html.erb
+++ b/app/views/media_objects/_metadata_display.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_multipart_dropdown_field.html.erb b/app/views/media_objects/_multipart_dropdown_field.html.erb
index c14af9df58..5eb304db46 100644
--- a/app/views/media_objects/_multipart_dropdown_field.html.erb
+++ b/app/views/media_objects/_multipart_dropdown_field.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_remove_item.html.erb b/app/views/media_objects/_remove_item.html.erb
index f76045c033..c984f75bcd 100644
--- a/app/views/media_objects/_remove_item.html.erb
+++ b/app/views/media_objects/_remove_item.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_resource_description.html.erb b/app/views/media_objects/_resource_description.html.erb
index 0073ac363c..2df674a0b1 100644
--- a/app/views/media_objects/_resource_description.html.erb
+++ b/app/views/media_objects/_resource_description.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_sections.html.erb b/app/views/media_objects/_sections.html.erb
index 30fd08aaa9..4dfff4d855 100644
--- a/app/views/media_objects/_sections.html.erb
+++ b/app/views/media_objects/_sections.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_share.html.erb b/app/views/media_objects/_share.html.erb
index 119149494f..74c6a89f66 100644
--- a/app/views/media_objects/_share.html.erb
+++ b/app/views/media_objects/_share.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_share_resource.html.erb b/app/views/media_objects/_share_resource.html.erb
index b2a24f27f6..80f02840ad 100644
--- a/app/views/media_objects/_share_resource.html.erb
+++ b/app/views/media_objects/_share_resource.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_structure.html.erb b/app/views/media_objects/_structure.html.erb
index 89a6813162..0baa38c478 100644
--- a/app/views/media_objects/_structure.html.erb
+++ b/app/views/media_objects/_structure.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
@@ -14,7 +14,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 ---  END LICENSE_HEADER BLOCK  ---
 %>
 
-<p class="muted">Drag files to reorder them.</p>
+<p class="text-muted">Drag files to reorder them.</p>
 
 <% if @masterFiles.blank? %>
   <div class="well">There are no media files</div>
@@ -70,9 +70,9 @@ Unless required by applicable law or agreed to in writing, software distributed
             <div class="btn-toolbar">
               <label class="btn btn-primary btn-struct mr-1 file-upload-label" for="structure_<%= index %>_filedata"><%= section.structuralMetadata.present? ? 'Replace' : 'Upload'%></label>
               <% if section.structuralMetadata.valid? %>
-              <%= react_component("ReactButtonContainer", {sectionIndex: index, masterFileID: section.id, baseURL: request.protocol+request.host_with_port, streamDuration: section.duration, audioURL: stream_url, initStructure: section.structuralMetadata.as_json}) %>
+                <%= react_component("ReactButtonContainer", {canvasIndex: index, mediaObjectID: @media_object.id, masterFileID: section.id, baseURL: request.protocol+request.host_with_port, initStructure: section.structuralMetadata.as_json}) %>
               <% else %>
-              <%= react_component("ReactButtonContainer", {sectionIndex: index, masterFileID: section.id, baseURL: request.protocol+request.host_with_port, streamDuration: section.duration, audioURL: stream_url, initStructure: { label: "#{item_label}", type: "div", items: [] }}, html_options={ class: 'react-button-container' }) %>
+                <%= react_component("ReactButtonContainer", {canvasIndex: index, mediaObjectID: @media_object.id, masterFileID: section.id, baseURL: request.protocol+request.host_with_port, initStructure: { label: "#{item_label}", type: "div", items: [] }}, html_options={ class: 'react-button-container' }) %>
               <% end %>
               <button type="button" class="btn btn-primary btn-struct mr-1" value="Advanced Edit" data-toggle="modal"
                 data-target="#advanced_edit_structure_<%= index %>">Advanced Edit</button>
diff --git a/app/views/media_objects/_supplemental_files.html.erb b/app/views/media_objects/_supplemental_files.html.erb
index 20b67b29cd..07b4c054b7 100644
--- a/app/views/media_objects/_supplemental_files.html.erb
+++ b/app/views/media_objects/_supplemental_files.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_supplemental_files_list.html.erb b/app/views/media_objects/_supplemental_files_list.html.erb
index e1742a778b..33b9e36981 100644
--- a/app/views/media_objects/_supplemental_files_list.html.erb
+++ b/app/views/media_objects/_supplemental_files_list.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_supplemental_files_upload.html.erb b/app/views/media_objects/_supplemental_files_upload.html.erb
index 6e9ba876d6..50398234b6 100644
--- a/app/views/media_objects/_supplemental_files_upload.html.erb
+++ b/app/views/media_objects/_supplemental_files_upload.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_text_area.html.erb b/app/views/media_objects/_text_area.html.erb
index 2cbe68faae..dca9b2d2ab 100644
--- a/app/views/media_objects/_text_area.html.erb
+++ b/app/views/media_objects/_text_area.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_text_field.html.erb b/app/views/media_objects/_text_field.html.erb
index c517188370..6f99e3ec81 100644
--- a/app/views/media_objects/_text_field.html.erb
+++ b/app/views/media_objects/_text_field.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_timeline.html.erb b/app/views/media_objects/_timeline.html.erb
index 2d38a42aeb..e25e125a1e 100644
--- a/app/views/media_objects/_timeline.html.erb
+++ b/app/views/media_objects/_timeline.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_two_part_field.html.erb b/app/views/media_objects/_two_part_field.html.erb
index f04c5b60bb..4502f18c52 100644
--- a/app/views/media_objects/_two_part_field.html.erb
+++ b/app/views/media_objects/_two_part_field.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_typeahead_field.html.erb b/app/views/media_objects/_typeahead_field.html.erb
index 25f94f9d50..ceee0783eb 100644
--- a/app/views/media_objects/_typeahead_field.html.erb
+++ b/app/views/media_objects/_typeahead_field.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_workflow_buttons.html.erb b/app/views/media_objects/_workflow_buttons.html.erb
index 2457212aee..26b3181e35 100644
--- a/app/views/media_objects/_workflow_buttons.html.erb
+++ b/app/views/media_objects/_workflow_buttons.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/_workflow_progress.html.erb b/app/views/media_objects/_workflow_progress.html.erb
index 49339719bb..42d3350ef1 100644
--- a/app/views/media_objects/_workflow_progress.html.erb
+++ b/app/views/media_objects/_workflow_progress.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/confirm_remove.html.erb b/app/views/media_objects/confirm_remove.html.erb
index 9b5ef1c88e..c2f52e7e96 100644
--- a/app/views/media_objects/confirm_remove.html.erb
+++ b/app/views/media_objects/confirm_remove.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/edit.html.erb b/app/views/media_objects/edit.html.erb
index acef690248..e1f29fe788 100644
--- a/app/views/media_objects/edit.html.erb
+++ b/app/views/media_objects/edit.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/show.html.erb b/app/views/media_objects/show.html.erb
index 09efc2de56..07ba4a895c 100644
--- a/app/views/media_objects/show.html.erb
+++ b/app/views/media_objects/show.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/media_objects/tree.html.erb b/app/views/media_objects/tree.html.erb
index 59e1387a78..fce7eaca87 100644
--- a/app/views/media_objects/tree.html.erb
+++ b/app/views/media_objects/tree.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_access_control.html.erb b/app/views/modules/_access_control.html.erb
index bd414f7cc2..51f6d1ef23 100644
--- a/app/views/modules/_access_control.html.erb
+++ b/app/views/modules/_access_control.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_access_object.html.erb b/app/views/modules/_access_object.html.erb
index f57520c8a7..65fe9df6cd 100644
--- a/app/views/modules/_access_object.html.erb
+++ b/app/views/modules/_access_object.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_avalon_search_form.html.erb b/app/views/modules/_avalon_search_form.html.erb
index 37fb1ba183..aa0e4cf3b5 100644
--- a/app/views/modules/_avalon_search_form.html.erb
+++ b/app/views/modules/_avalon_search_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_become_message.html.erb b/app/views/modules/_become_message.html.erb
index a6970ba3d9..ea59992f9f 100644
--- a/app/views/modules/_become_message.html.erb
+++ b/app/views/modules/_become_message.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_flash_messages.html.erb b/app/views/modules/_flash_messages.html.erb
index c71a8df25e..a739c6bc80 100644
--- a/app/views/modules/_flash_messages.html.erb
+++ b/app/views/modules/_flash_messages.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_footer.html.erb b/app/views/modules/_footer.html.erb
index 4d271cf7bd..bb350efcd6 100644
--- a/app/views/modules/_footer.html.erb
+++ b/app/views/modules/_footer.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_global_navigation.html.erb b/app/views/modules/_global_navigation.html.erb
index 51cdff5abf..2ee7328fd3 100644
--- a/app/views/modules/_global_navigation.html.erb
+++ b/app/views/modules/_global_navigation.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_google_analytics.html.erb b/app/views/modules/_google_analytics.html.erb
index 315fd92bc3..89e8dabf20 100644
--- a/app/views/modules/_google_analytics.html.erb
+++ b/app/views/modules/_google_analytics.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_header.html.erb b/app/views/modules/_header.html.erb
index 8982374b45..b7a24e3f45 100644
--- a/app/views/modules/_header.html.erb
+++ b/app/views/modules/_header.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_tooltip.html.erb b/app/views/modules/_tooltip.html.erb
index ee493bf4e6..455aa334e1 100644
--- a/app/views/modules/_tooltip.html.erb
+++ b/app/views/modules/_tooltip.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/_user_management.html.erb b/app/views/modules/_user_management.html.erb
index a28654c477..bde0f7540a 100644
--- a/app/views/modules/_user_management.html.erb
+++ b/app/views/modules/_user_management.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/player/_audio_element.html.erb b/app/views/modules/player/_audio_element.html.erb
index 1f2d12b0bf..83ff67195d 100644
--- a/app/views/modules/player/_audio_element.html.erb
+++ b/app/views/modules/player/_audio_element.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/player/_section.html.erb b/app/views/modules/player/_section.html.erb
index 367e7025b3..5ae354d183 100644
--- a/app/views/modules/player/_section.html.erb
+++ b/app/views/modules/player/_section.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/modules/player/_video_element.html.erb b/app/views/modules/player/_video_element.html.erb
index ebbc74966d..98e49fa312 100644
--- a/app/views/modules/player/_video_element.html.erb
+++ b/app/views/modules/player/_video_element.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/notifications_mailer/new_collection.html.erb b/app/views/notifications_mailer/new_collection.html.erb
index e0df541efa..f825366b73 100644
--- a/app/views/notifications_mailer/new_collection.html.erb
+++ b/app/views/notifications_mailer/new_collection.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/notifications_mailer/update_collection.html.erb b/app/views/notifications_mailer/update_collection.html.erb
index 43f988fd48..ee3a21f562 100644
--- a/app/views/notifications_mailer/update_collection.html.erb
+++ b/app/views/notifications_mailer/update_collection.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlist_items/_current_item.html.erb b/app/views/playlist_items/_current_item.html.erb
index 949feb9961..cce75c27f1 100644
--- a/app/views/playlist_items/_current_item.html.erb
+++ b/app/views/playlist_items/_current_item.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlist_items/_markers.html.erb b/app/views/playlist_items/_markers.html.erb
index e58803a7da..6e4de8a083 100644
--- a/app/views/playlist_items/_markers.html.erb
+++ b/app/views/playlist_items/_markers.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlist_items/_related_items.html.erb b/app/views/playlist_items/_related_items.html.erb
index 1e011d786d..33b88fe74c 100644
--- a/app/views/playlist_items/_related_items.html.erb
+++ b/app/views/playlist_items/_related_items.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_copy_playlist_modal.html.erb b/app/views/playlists/_copy_playlist_modal.html.erb
index 57f37ece80..d1d5c109da 100644
--- a/app/views/playlists/_copy_playlist_modal.html.erb
+++ b/app/views/playlists/_copy_playlist_modal.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_current_item.html.erb b/app/views/playlists/_current_item.html.erb
index c0774319ff..2695a071d9 100644
--- a/app/views/playlists/_current_item.html.erb
+++ b/app/views/playlists/_current_item.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_current_masterfile.html.erb b/app/views/playlists/_current_masterfile.html.erb
index d53672ec05..051860bb49 100644
--- a/app/views/playlists/_current_masterfile.html.erb
+++ b/app/views/playlists/_current_masterfile.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_edit_form.html.erb b/app/views/playlists/_edit_form.html.erb
index 11284a8ec6..264c58d8fd 100644
--- a/app/views/playlists/_edit_form.html.erb
+++ b/app/views/playlists/_edit_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_form.html.erb b/app/views/playlists/_form.html.erb
index ba7115f7e4..a033f0a069 100644
--- a/app/views/playlists/_form.html.erb
+++ b/app/views/playlists/_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_info.html.erb b/app/views/playlists/_info.html.erb
index f8df474943..afac78fcb5 100644
--- a/app/views/playlists/_info.html.erb
+++ b/app/views/playlists/_info.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_item_list.html.erb b/app/views/playlists/_item_list.html.erb
index e52c862fdb..954f733cec 100644
--- a/app/views/playlists/_item_list.html.erb
+++ b/app/views/playlists/_item_list.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_lti_url.html.erb b/app/views/playlists/_lti_url.html.erb
index 7983c70380..6c0a954ded 100644
--- a/app/views/playlists/_lti_url.html.erb
+++ b/app/views/playlists/_lti_url.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_markers.html.erb b/app/views/playlists/_markers.html.erb
index 3c3665d0bb..c46f145d88 100644
--- a/app/views/playlists/_markers.html.erb
+++ b/app/views/playlists/_markers.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_mejs4_add_marker_to_playlist.html.erb b/app/views/playlists/_mejs4_add_marker_to_playlist.html.erb
index a186f39346..c279e643fc 100644
--- a/app/views/playlists/_mejs4_add_marker_to_playlist.html.erb
+++ b/app/views/playlists/_mejs4_add_marker_to_playlist.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_mejs4_player_js.html.erb b/app/views/playlists/_mejs4_player_js.html.erb
index a2bc43fd0e..9443646029 100644
--- a/app/views/playlists/_mejs4_player_js.html.erb
+++ b/app/views/playlists/_mejs4_player_js.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_mejs4_playlist_item.html.erb b/app/views/playlists/_mejs4_playlist_item.html.erb
index e6daab913b..de73246b2f 100644
--- a/app/views/playlists/_mejs4_playlist_item.html.erb
+++ b/app/views/playlists/_mejs4_playlist_item.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_player.html.erb b/app/views/playlists/_player.html.erb
index 6dbba4ee63..e94810be3c 100644
--- a/app/views/playlists/_player.html.erb
+++ b/app/views/playlists/_player.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_playlist_item.html.erb b/app/views/playlists/_playlist_item.html.erb
index 3ea03ebfd2..e89c6e4e53 100644
--- a/app/views/playlists/_playlist_item.html.erb
+++ b/app/views/playlists/_playlist_item.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_share.html.erb b/app/views/playlists/_share.html.erb
index 45f8c304ac..59dfc42fed 100644
--- a/app/views/playlists/_share.html.erb
+++ b/app/views/playlists/_share.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_share_resource.html.erb b/app/views/playlists/_share_resource.html.erb
index 43046dafad..631b620b80 100644
--- a/app/views/playlists/_share_resource.html.erb
+++ b/app/views/playlists/_share_resource.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_show_playlist_details.html.erb b/app/views/playlists/_show_playlist_details.html.erb
index 2ed7e352cf..3849f397e8 100644
--- a/app/views/playlists/_show_playlist_details.html.erb
+++ b/app/views/playlists/_show_playlist_details.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/_tag_form.html.erb b/app/views/playlists/_tag_form.html.erb
index 27a182cb6f..3ee673e4b6 100644
--- a/app/views/playlists/_tag_form.html.erb
+++ b/app/views/playlists/_tag_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/edit.html.erb b/app/views/playlists/edit.html.erb
index 2780366b3a..9c6881e83a 100644
--- a/app/views/playlists/edit.html.erb
+++ b/app/views/playlists/edit.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/import_variations_playlist.html.erb b/app/views/playlists/import_variations_playlist.html.erb
index b3ddd0fd80..3f07f8726b 100644
--- a/app/views/playlists/import_variations_playlist.html.erb
+++ b/app/views/playlists/import_variations_playlist.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/index.html.erb b/app/views/playlists/index.html.erb
index e7ede56889..7e25f8042e 100644
--- a/app/views/playlists/index.html.erb
+++ b/app/views/playlists/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/new.html.erb b/app/views/playlists/new.html.erb
index da470a823b..cc0cef5783 100644
--- a/app/views/playlists/new.html.erb
+++ b/app/views/playlists/new.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/refresh_info.js.erb b/app/views/playlists/refresh_info.js.erb
index 5a8520f48d..53c3edbecf 100644
--- a/app/views/playlists/refresh_info.js.erb
+++ b/app/views/playlists/refresh_info.js.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/playlists/show.html.erb b/app/views/playlists/show.html.erb
index 03c6b45198..c44b01f4ec 100644
--- a/app/views/playlists/show.html.erb
+++ b/app/views/playlists/show.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/samvera/persona/users/index.html.erb b/app/views/samvera/persona/users/index.html.erb
index be42c89edc..b08b8b9753 100644
--- a/app/views/samvera/persona/users/index.html.erb
+++ b/app/views/samvera/persona/users/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/_copy_timeline_modal.html.erb b/app/views/timelines/_copy_timeline_modal.html.erb
index e8d1261924..59dd33b1aa 100644
--- a/app/views/timelines/_copy_timeline_modal.html.erb
+++ b/app/views/timelines/_copy_timeline_modal.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/_edit_form.html.erb b/app/views/timelines/_edit_form.html.erb
index da53e4f829..7a45d901f9 100644
--- a/app/views/timelines/_edit_form.html.erb
+++ b/app/views/timelines/_edit_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/_form.html.erb b/app/views/timelines/_form.html.erb
index 43ea9fc4bd..595c37f2d9 100644
--- a/app/views/timelines/_form.html.erb
+++ b/app/views/timelines/_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/_show_timeline_details.html.erb b/app/views/timelines/_show_timeline_details.html.erb
index 162d1ea14e..7979c7db90 100644
--- a/app/views/timelines/_show_timeline_details.html.erb
+++ b/app/views/timelines/_show_timeline_details.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/_tag_form.html.erb b/app/views/timelines/_tag_form.html.erb
index 60cc4710e8..87378cbaf5 100644
--- a/app/views/timelines/_tag_form.html.erb
+++ b/app/views/timelines/_tag_form.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/edit.html.erb b/app/views/timelines/edit.html.erb
index d84bab9c31..88dc6cdcd1 100644
--- a/app/views/timelines/edit.html.erb
+++ b/app/views/timelines/edit.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/index.html.erb b/app/views/timelines/index.html.erb
index fe5a3537b5..6325cd6881 100644
--- a/app/views/timelines/index.html.erb
+++ b/app/views/timelines/index.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/new.html.erb b/app/views/timelines/new.html.erb
index c856b9830b..e098b2a255 100644
--- a/app/views/timelines/new.html.erb
+++ b/app/views/timelines/new.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/app/views/timelines/show.html.erb b/app/views/timelines/show.html.erb
index 3e0060964a..74aef134da 100644
--- a/app/views/timelines/show.html.erb
+++ b/app/views/timelines/show.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
@@ -24,4 +24,4 @@ Unless required by applicable law or agreed to in writing, software distributed
       $('#footer').css('top', $(this).height() + 5);
     });
   </script>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/timelines/timeliner.html.erb b/app/views/timelines/timeliner.html.erb
index bf450f0e15..e8617122e5 100644
--- a/app/views/timelines/timeliner.html.erb
+++ b/app/views/timelines/timeliner.html.erb
@@ -1,5 +1,5 @@
 <%#
-Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+Copyright 2011-2023, The Trustees of Indiana University and Northwestern
   University.  Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
 
diff --git a/bin/rails b/bin/rails
index 0739660237..efc0377492 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"
diff --git a/bin/rake b/bin/rake
index 17240489f6..4fbf10b960 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run
diff --git a/bin/setup b/bin/setup
index 5853b5ea87..ec47b79b3b 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,36 +1,33 @@
 #!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies
-  # system('bin/yarn')
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end
diff --git a/bin/yarn b/bin/yarn
index 460dd565b4..9fab2c3507 100755
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  begin
-    exec "yarnpkg", *ARGV
-  rescue Errno::ENOENT
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
+    select { |dir| File.expand_path(dir) != __dir__ }.
+    product(["yarn", "yarn.cmd", "yarn.ps1"]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, *ARGV
+  else
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
     exit 1
diff --git a/config.ru b/config.ru
index bd83b25412..4a3c09a688 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative "config/environment"
+
 run Rails.application
+Rails.application.load_server
diff --git a/config/application.rb b/config/application.rb
index 96f1bbfcb0..3328dce071 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,7 +8,7 @@
 Bundler.require(*Rails.groups)
 
 module Avalon
-  VERSION = '7.5.1'
+  VERSION = '7.6.0'
 
   class Application < Rails::Application
     require 'avalon/configuration'
@@ -32,6 +32,8 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
+    # config.eager_load_paths << Rails.root.join("extras")
+
     config.active_job.queue_adapter = :sidekiq
 
     config.action_dispatch.default_headers = { 'X-Frame-Options' => 'ALLOWALL' }
@@ -45,6 +47,8 @@ class Application < Rails::Application
         resource '/master_files/*/structure.json', headers: :any, methods: [:get, :post, :delete]
         resource '/master_files/*/waveform.json', headers: :any, methods: [:get]
         resource '/master_files/*/*.m3u8', headers: :any, credentials: true, methods: [:get, :head]
+        resource '/master_files/*/caption_manifest', headers: :any, methods: [:get]
+        resource '/master_files/*/captions', headers: :any, methods: [:get]
         resource '/timelines/*/manifest.json', headers: :any, methods: [:get, :post]
       end
     end
diff --git a/config/boot.rb b/config/boot.rb
index b9e460cef3..988a5ddc46 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb46..cac5315775 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d4290e00ce..067820227b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
 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 on
-  # every request. This slows down response time but is perfect for development
+  # 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.
   config.cache_classes = false
 
@@ -12,15 +14,18 @@
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -41,6 +46,12 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
@@ -56,10 +67,16 @@
   config.assets.quiet = true
 
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   # Do NOT use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc because this feature depends on the listen gem.
   # ActiveSupport::EventedFileUpdateChecker does not work with M1 Macs
   config.file_watcher = ActiveSupport::FileUpdateChecker
+
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ce735d9d25..3039ff56ad 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -23,7 +25,7 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = Uglifier.new(:harmony => true)
@@ -35,25 +37,25 @@
   config.assets.compile = true
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # config.asset_host = "http://assets.example.com"
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   #config.active_storage.service = :local
 
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
-  # config.action_cable.url = 'wss://example.com/cable'
-  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+  # config.action_cable.url = "wss://example.com/cable"
+  # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Use the lowest log level to ensure availability of diagnostic information
-  # when problems arise.
+  # Include generic and useful information about system operation, but avoid logging too much
+  # information to avoid inadvertent exposure of personally identifiable information (PII).
   config.log_level = :info
 
   # Suppress logger output for asset requests.
@@ -81,15 +83,15 @@
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
   # Use a different logger for distributed setups.
-  # require 'syslog/logger'
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+  # require "syslog/logger"
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?
     logger           = ActiveSupport::Logger.new(STDOUT)
@@ -99,28 +101,4 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Inserts middleware to perform automatic connection switching.
-  # The `database_selector` hash is used to pass options to the DatabaseSelector
-  # middleware. The `delay` is used to determine how long to wait after a write
-  # to send a subsequent read to the primary.
-  #
-  # The `database_resolver` class is used by the middleware to determine which
-  # database is appropriate to use based on the time delay.
-  #
-  # The `database_resolver_context` class is used by the middleware to set
-  # timestamps for the last write to the primary. The resolver uses the context
-  # class timestamps to determine how long to wait before reading from the
-  # replica.
-  #
-  # By default Rails will store a last write timestamp in the session. The
-  # DatabaseSelector middleware is designed as such you can define your own
-  # strategy for connection switching and pass that into the middleware through
-  # these configuration options.
-  # config.active_record.database_selector = { delay: 2.seconds }
-  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
-  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
-
-  # Additional production specific initializers
-  Dir["config/environments/production/*.rb"].each {|file| load file }
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d301e54903..180c88aeaa 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,5 @@
+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
@@ -6,22 +8,24 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
   config.cache_classes = true
 
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
-  config.eager_load = false
+  # Eager loading loads your whole application. When running a single test locally,
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # system, or in some way before deploying your code.
+  config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :memory_store
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
@@ -42,6 +46,15 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 end
diff --git a/config/initializers/active_fedora_general.rb b/config/initializers/active_fedora_general.rb
index dbbbf09274..17bbe1408f 100644
--- a/config/initializers/active_fedora_general.rb
+++ b/config/initializers/active_fedora_general.rb
@@ -8,6 +8,12 @@
                                          end
 ActiveFedora::Base.logger = Rails.logger
 
+# ActiveFedora 14.x+ does not set these by default for some reason so need to set them here
+# Without these set AF::File subclasses like StructuralMetadata will include the btree in their ids
+# (e.g. ab/cd/ef/gh/abcdefghi/structuralMetadata) which messes up SpeedyAF (and probably other things)
+ActiveFedora::File.translate_uri_to_id = ActiveFedora::Base.translate_uri_to_id
+ActiveFedora::File.translate_id_to_uri = ActiveFedora::Base.translate_id_to_uri
+
 # ActiveModel::Dirty's internals were substantially rewritten in Rails 6 making the following monkey-patch potentially unnecessary.
 # We will need to test this throroughly to ensure it is safe to remove.
 #
@@ -28,3 +34,60 @@ def content_disposition_filename
     ::RDF::URI.decode(filename) if filename
   end
 end
+
+# Overrides that ensure AccessControl objects are marked dirty when read/edit/discover groups/users are changed and autosave if dirty
+# This fixes a timing bug where AccessControl objects are saved in an after_save callback which runs after normal indexing occurs
+# See https://github.com/avalonmediasystem/avalon/issues/5140
+
+# Override contained_rdf_sources to ensure AccessControl objects get autosaved when dirty
+ActiveFedora::Base.class_eval do
+  private
+    def save_contained_resources
+      contained_resources.changed.each do |_, resource|
+        resource.save
+      end
+      save_access_control_resources
+    end
+
+    def save_access_control_resources
+      access_control_sources.changed.each do |_, resource|
+	resource.save
+      end
+    end
+
+    def access_control_sources
+      @access_control_sources ||= ActiveFedora::AssociationHash.new(self, access_control_reflections)
+    end
+
+    def access_control_reflections
+      self.class.reflect_on_all_associations(:belongs_to).select { |_, reflection| reflection.klass <= Hydra::AccessControl }
+    end
+end
+
+# Enable dirty tracking for the permissions attribute
+Rails.application.config.to_prepare do
+  Hydra::AccessControl.define_attribute_methods :permissions
+end
+
+# Override set_entities to notify ActiveModel::Dirty dirty tracking that the permissions attribute is changing
+Hydra::AccessControls::Permissions.module_eval do
+  private
+      # @param [Symbol] permission either :discover, :read or :edit
+      # @param [Symbol] type either :person or :group
+      # @param [Array<String>] values Values to set
+      # @param [Array<String>] changeable Values we are allowed to change
+      def set_entities(permission, type, values, changeable)
+        (changeable - values).each do |entity|
+          for_destroy = search_by_type_and_mode(type, permission_to_uri(permission)).select { |p| p.agent_name == entity }
+          access_control.permissions_will_change!
+          permissions.delete(for_destroy)
+        end
+
+        values.each do |agent_name|
+          exists = search_by_type_and_mode(type, permission_to_uri(permission)).select { |p| p.agent_name == agent_name }
+          access_control.permissions_will_change!
+          permissions.build(name: agent_name, access: permission.to_s, type: type) unless exists.present?
+        end
+      end
+end
+# End of overrides for AccessControl dirty tracking and autosaving
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index c60ea35e54..9fe6acd00d 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 59385cdf37..33699c3091 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,7 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 35d0f26fcd..54f47cf15f 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,30 +1,25 @@
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-# Rails.application.config.content_security_policy do |policy|
-#   policy.default_src :self, :https
-#   policy.font_src    :self, :https, :data
-#   policy.img_src     :self, :https, :data
-#   policy.object_src  :none
-#   policy.script_src  :self, :https
-#   policy.style_src   :self, :https
-#   # If you are using webpack-dev-server then specify webpack-dev-server host
-#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
-
-#   # Specify URI for violation reports
-#   # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
 # end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 9085325791..c94cefe824 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,353 +1,354 @@
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
-  # The secret key used by Devise. Devise uses this key to generate
-  # random tokens. Changing this key will render invalid all existing
-  # confirmation, reset password and unlock tokens in the database.
-  # Devise will use the `secret_key_base` as its `secret_key`
-  # by default. You can change it below and use your own secret key.
-  # config.secret_key = '954891a731718dd9c577d1be0d85c6f4bae4dbd43a82864954ad82523ba708317b28d3c5a7cde5288cddea43884a87c16d6501678fc92426599c6d9277c8aec5'
-
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class
-  # with default "from" parameter.
-  config.mailer_sender = Settings.email.notification
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = 'Devise::Mailer'
-
-  # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:login, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  config.authentication_keys = [:username]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [:username, :login, :email]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [:username, :login, :email]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:database]` will
-  # enable it only for database authentication. The supported strategies are:
-  # :database      = Support basic authentication with authentication key + password
-  # config.http_authenticatable = false
-
-  # If 401 status code should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. 'Application' by default.
-  # config.http_authentication_realm = 'Application'
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # particular strategies by setting this option.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing skip: :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
-
-  # By default, Devise cleans up the CSRF token on authentication to
-  # avoid CSRF token fixation attacks. This means that, when using AJAX
-  # requests for sign in and sign up, you need to get a new CSRF token
-  # from the server. You can disable this option at your own risk.
-  # config.clean_up_csrf_token_on_authentication = true
-
-  # When false, Devise will not attempt to reload routes on eager load.
-  # This can reduce the time taken to boot the app but if your application
-  # requires the Devise mappings to be loaded during boot time the application
-  # won't boot properly.
-  # config.reload_routes = true
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
-  # using other algorithms, it sets how many times you want the password to be hashed.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments. Note that, for bcrypt (the default
-  # algorithm), the cost increases exponentially with the number of stretches (e.g.
-  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
-  config.stretches = Rails.env.test? ? 1 : 11
-
-  # Set up a pepper to generate the hashed password.
-  # config.pepper = '2494a81cfee550c3640539b4bcbfa986f6559011bd05d896d6d6720d6d56a17bd5f3cdab2d975f94c3ae4fa39c07ddae1a07dddc28693caf33a29f01e3fac0d6'
-
-  # Send a notification email when the user's password is changed
-  # config.send_password_change_notification = false
-
-  # ==> Configuration for :invitable
-  # The period the generated invitation token is valid, after
-  # this period, the invited resource won't be able to accept the invitation.
-  # When invite_for is 0 (the default), the invitation won't expire.
-  # config.invite_for = 2.weeks
-
-  # Number of invitations users can send.
-  # - If invitation_limit is nil, there is no limit for invitations, users can
-  # send unlimited invitations, invitation_limit column is not used.
-  # - If invitation_limit is 0, users can't send invitations by default.
-  # - If invitation_limit n > 0, users can send n invitations.
-  # You can change invitation_limit column for some users so they can send more
-  # or less invitations, even with global invitation_limit = 0
-  # Default: nil
-  # config.invitation_limit = 5
-
-  # The key to be used to check existing users when sending an invitation
-  # and the regexp used to test it when validate_on_invite is not set.
-  # config.invite_key = {:email => /\A[^@]+@[^@]+\z/}
-  # config.invite_key = {:email => /\A[^@]+@[^@]+\z/, :login => nil}
-
-  # Flag that force a record to be valid before being actually invited
-  # Default: false
-  # config.validate_on_invite = true
-
-  # Resend invitation if user with invited status is invited again
-  # Default: true
-  # config.resend_invitation = false
-
-  # The class name of the inviting model. If this is nil,
-  # the #invited_by association is declared to be polymorphic.
-  # Default: nil
-  # config.invited_by_class_name = 'User'
-
-  # The foreign key to the inviting model (if invited_by_class_name is set)
-  # Default: :invited_by_id
-  # config.invited_by_foreign_key = :invited_by_id
-
-  # The column name used for counter_cache column. If this is nil,
-  # the #invited_by association is declared without counter_cache.
-  # Default: nil
-  # config.invited_by_counter_cache = :invitations_count
-
-  # Auto-login after the user accepts the invite. If this is false,
-  # the user will need to manually log in after accepting the invite.
-  # Default: true
-  # config.allow_insecure_sign_in_after_accept = false
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming their account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming their account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming their account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # A period that the user is allowed to confirm their account before their
-  # token becomes invalid. For example, if set to 3.days, the user can confirm
-  # their account within 3 days after the mail was sent, but on the fourth day
-  # their account can't be confirmed with the token any more.
-  # Default is nil, meaning there is no restriction on how long a user can take
-  # before confirming their account.
-  # config.confirm_within = 3.days
-
-  # If true, requires any email changes to be confirmed (exactly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed, new email is stored in
-  # unconfirmed_email column, and copied to email column on successful confirmation.
-  config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [:email]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # Invalidates all the remember me tokens when the user signs out.
-  config.expire_all_remember_me_on_sign_out = true
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # secure: true in order to force SSL only cookies.
-  # config.rememberable_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length.
-  config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [:email]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # Warn on the last attempt before the account is locked.
-  # config.last_attempt_warning = true
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [:email]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
-  config.reset_password_within = 6.hours
-
-  # When set to false, does not sign a user in automatically after their password is
-  # reset. Defaults to true, so a user is signed in automatically after a reset.
-  # config.sign_in_after_reset_password = true
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
-  # You can use :sha1, :sha512 or algorithms from others authentication tools as
-  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
-  # for default behavior) and :restful_authentication_sha1 (then you should set
-  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
-  #
-  # Require the `devise-encryptable` gem when using anything other than bcrypt
-  # config.encryptor = :sha512
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Set this configuration to false if you want /users/sign_out to sign out
-  # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ['*/*', :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :get
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
-
-  Avalon::Authentication::Providers.each do |provider|
-    if provider[:provider] == :lti
-      provider[:params].merge!({consumers: Avalon::Lti::Configuration})
+Rails.application.reloader.to_prepare do
+  # Use this hook to configure devise mailer, warden hooks and so forth.
+  # Many of these configuration options can be set straight in your model.
+  Devise.setup do |config|
+    # The secret key used by Devise. Devise uses this key to generate
+    # random tokens. Changing this key will render invalid all existing
+    # confirmation, reset password and unlock tokens in the database.
+    # Devise will use the `secret_key_base` as its `secret_key`
+    # by default. You can change it below and use your own secret key.
+    # config.secret_key = '954891a731718dd9c577d1be0d85c6f4bae4dbd43a82864954ad82523ba708317b28d3c5a7cde5288cddea43884a87c16d6501678fc92426599c6d9277c8aec5'
+
+    # ==> Mailer Configuration
+    # Configure the e-mail address which will be shown in Devise::Mailer,
+    # note that it will be overwritten if you use your own mailer class
+    # with default "from" parameter.
+    config.mailer_sender = Settings.email.notification
+
+    # Configure the class responsible to send e-mails.
+    # config.mailer = 'Devise::Mailer'
+
+    # Configure the parent class responsible to send e-mails.
+    # config.parent_mailer = 'ActionMailer::Base'
+
+    # ==> ORM configuration
+    # Load and configure the ORM. Supports :active_record (default) and
+    # :mongoid (bson_ext recommended) by default. Other ORMs may be
+    # available as additional gems.
+    require 'devise/orm/active_record'
+
+    # ==> Configuration for any authentication mechanism
+    # Configure which keys are used when authenticating a user. The default is
+    # just :email. You can configure it to use [:login, :subdomain], so for
+    # authenticating a user, both parameters are required. Remember that those
+    # parameters are used only when authenticating and not when retrieving from
+    # session. If you need permissions, you should implement that in a before filter.
+    # You can also supply a hash where the value is a boolean determining whether
+    # or not authentication should be aborted when the value is not present.
+    config.authentication_keys = [:username]
+
+    # Configure parameters from the request object used for authentication. Each entry
+    # given should be a request method and it will automatically be passed to the
+    # find_for_authentication method and considered in your model lookup. For instance,
+    # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+    # The same considerations mentioned for authentication_keys also apply to request_keys.
+    # config.request_keys = []
+
+    # Configure which authentication keys should be case-insensitive.
+    # These keys will be downcased upon creating or modifying a user and when used
+    # to authenticate or find a user. Default is :email.
+    config.case_insensitive_keys = [:username, :login, :email]
+
+    # Configure which authentication keys should have whitespace stripped.
+    # These keys will have whitespace before and after removed upon creating or
+    # modifying a user and when used to authenticate or find a user. Default is :email.
+    config.strip_whitespace_keys = [:username, :login, :email]
+
+    # Tell if authentication through request.params is enabled. True by default.
+    # It can be set to an array that will enable params authentication only for the
+    # given strategies, for example, `config.params_authenticatable = [:database]` will
+    # enable it only for database (email + password) authentication.
+    # config.params_authenticatable = true
+
+    # Tell if authentication through HTTP Auth is enabled. False by default.
+    # It can be set to an array that will enable http authentication only for the
+    # given strategies, for example, `config.http_authenticatable = [:database]` will
+    # enable it only for database authentication. The supported strategies are:
+    # :database      = Support basic authentication with authentication key + password
+    # config.http_authenticatable = false
+
+    # If 401 status code should be returned for AJAX requests. True by default.
+    # config.http_authenticatable_on_xhr = true
+
+    # The realm used in Http Basic Authentication. 'Application' by default.
+    # config.http_authentication_realm = 'Application'
+
+    # It will change confirmation, password recovery and other workflows
+    # to behave the same regardless if the e-mail provided was right or wrong.
+    # Does not affect registerable.
+    # config.paranoid = true
+
+    # By default Devise will store the user in session. You can skip storage for
+    # particular strategies by setting this option.
+    # Notice that if you are skipping storage for all authentication paths, you
+    # may want to disable generating routes to Devise's sessions controller by
+    # passing skip: :sessions to `devise_for` in your config/routes.rb
+    config.skip_session_storage = [:http_auth]
+
+    # By default, Devise cleans up the CSRF token on authentication to
+    # avoid CSRF token fixation attacks. This means that, when using AJAX
+    # requests for sign in and sign up, you need to get a new CSRF token
+    # from the server. You can disable this option at your own risk.
+    # config.clean_up_csrf_token_on_authentication = true
+
+    # When false, Devise will not attempt to reload routes on eager load.
+    # This can reduce the time taken to boot the app but if your application
+    # requires the Devise mappings to be loaded during boot time the application
+    # won't boot properly.
+    # config.reload_routes = true
+
+    # ==> Configuration for :database_authenticatable
+    # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+    # using other algorithms, it sets how many times you want the password to be hashed.
+    #
+    # Limiting the stretches to just one in testing will increase the performance of
+    # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+    # a value less than 10 in other environments. Note that, for bcrypt (the default
+    # algorithm), the cost increases exponentially with the number of stretches (e.g.
+    # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+    config.stretches = Rails.env.test? ? 1 : 11
+
+    # Set up a pepper to generate the hashed password.
+    # config.pepper = '2494a81cfee550c3640539b4bcbfa986f6559011bd05d896d6d6720d6d56a17bd5f3cdab2d975f94c3ae4fa39c07ddae1a07dddc28693caf33a29f01e3fac0d6'
+
+    # Send a notification email when the user's password is changed
+    # config.send_password_change_notification = false
+
+    # ==> Configuration for :invitable
+    # The period the generated invitation token is valid, after
+    # this period, the invited resource won't be able to accept the invitation.
+    # When invite_for is 0 (the default), the invitation won't expire.
+    # config.invite_for = 2.weeks
+
+    # Number of invitations users can send.
+    # - If invitation_limit is nil, there is no limit for invitations, users can
+    # send unlimited invitations, invitation_limit column is not used.
+    # - If invitation_limit is 0, users can't send invitations by default.
+    # - If invitation_limit n > 0, users can send n invitations.
+    # You can change invitation_limit column for some users so they can send more
+    # or less invitations, even with global invitation_limit = 0
+    # Default: nil
+    # config.invitation_limit = 5
+
+    # The key to be used to check existing users when sending an invitation
+    # and the regexp used to test it when validate_on_invite is not set.
+    # config.invite_key = {:email => /\A[^@]+@[^@]+\z/}
+    # config.invite_key = {:email => /\A[^@]+@[^@]+\z/, :login => nil}
+
+    # Flag that force a record to be valid before being actually invited
+    # Default: false
+    # config.validate_on_invite = true
+
+    # Resend invitation if user with invited status is invited again
+    # Default: true
+    # config.resend_invitation = false
+
+    # The class name of the inviting model. If this is nil,
+    # the #invited_by association is declared to be polymorphic.
+    # Default: nil
+    # config.invited_by_class_name = 'User'
+
+    # The foreign key to the inviting model (if invited_by_class_name is set)
+    # Default: :invited_by_id
+    # config.invited_by_foreign_key = :invited_by_id
+
+    # The column name used for counter_cache column. If this is nil,
+    # the #invited_by association is declared without counter_cache.
+    # Default: nil
+    # config.invited_by_counter_cache = :invitations_count
+
+    # Auto-login after the user accepts the invite. If this is false,
+    # the user will need to manually log in after accepting the invite.
+    # Default: true
+    # config.allow_insecure_sign_in_after_accept = false
+
+    # ==> Configuration for :confirmable
+    # A period that the user is allowed to access the website even without
+    # confirming their account. For instance, if set to 2.days, the user will be
+    # able to access the website for two days without confirming their account,
+    # access will be blocked just in the third day. Default is 0.days, meaning
+    # the user cannot access the website without confirming their account.
+    # config.allow_unconfirmed_access_for = 2.days
+
+    # A period that the user is allowed to confirm their account before their
+    # token becomes invalid. For example, if set to 3.days, the user can confirm
+    # their account within 3 days after the mail was sent, but on the fourth day
+    # their account can't be confirmed with the token any more.
+    # Default is nil, meaning there is no restriction on how long a user can take
+    # before confirming their account.
+    # config.confirm_within = 3.days
+
+    # If true, requires any email changes to be confirmed (exactly the same way as
+    # initial account confirmation) to be applied. Requires additional unconfirmed_email
+    # db field (see migrations). Until confirmed, new email is stored in
+    # unconfirmed_email column, and copied to email column on successful confirmation.
+    config.reconfirmable = true
+
+    # Defines which key will be used when confirming an account
+    # config.confirmation_keys = [:email]
+
+    # ==> Configuration for :rememberable
+    # The time the user will be remembered without asking for credentials again.
+    # config.remember_for = 2.weeks
+
+    # Invalidates all the remember me tokens when the user signs out.
+    config.expire_all_remember_me_on_sign_out = true
+
+    # If true, extends the user's remember period when remembered via cookie.
+    # config.extend_remember_period = false
+
+    # Options to be passed to the created cookie. For instance, you can set
+    # secure: true in order to force SSL only cookies.
+    # config.rememberable_options = {}
+
+    # ==> Configuration for :validatable
+    # Range for password length.
+    config.password_length = 6..128
+
+    # Email regex used to validate email formats. It simply asserts that
+    # one (and only one) @ exists in the given string. This is mainly
+    # to give user feedback and not to assert the e-mail validity.
+    config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+    # ==> Configuration for :timeoutable
+    # The time you want to timeout the user session without activity. After this
+    # time the user will be asked for credentials again. Default is 30 minutes.
+    # config.timeout_in = 30.minutes
+
+    # ==> Configuration for :lockable
+    # Defines which strategy will be used to lock an account.
+    # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+    # :none            = No lock strategy. You should handle locking by yourself.
+    # config.lock_strategy = :failed_attempts
+
+    # Defines which key will be used when locking and unlocking an account
+    # config.unlock_keys = [:email]
+
+    # Defines which strategy will be used to unlock an account.
+    # :email = Sends an unlock link to the user email
+    # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+    # :both  = Enables both strategies
+    # :none  = No unlock strategy. You should handle unlocking by yourself.
+    # config.unlock_strategy = :both
+
+    # Number of authentication tries before locking an account if lock_strategy
+    # is failed attempts.
+    # config.maximum_attempts = 20
+
+    # Time interval to unlock the account if :time is enabled as unlock_strategy.
+    # config.unlock_in = 1.hour
+
+    # Warn on the last attempt before the account is locked.
+    # config.last_attempt_warning = true
+
+    # ==> Configuration for :recoverable
+    #
+    # Defines which key will be used when recovering the password for an account
+    # config.reset_password_keys = [:email]
+
+    # Time interval you can reset your password with a reset password key.
+    # Don't put a too small interval or your users won't have the time to
+    # change their passwords.
+    config.reset_password_within = 6.hours
+
+    # When set to false, does not sign a user in automatically after their password is
+    # reset. Defaults to true, so a user is signed in automatically after a reset.
+    # config.sign_in_after_reset_password = true
+
+    # ==> Configuration for :encryptable
+    # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+    # You can use :sha1, :sha512 or algorithms from others authentication tools as
+    # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+    # for default behavior) and :restful_authentication_sha1 (then you should set
+    # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+    #
+    # Require the `devise-encryptable` gem when using anything other than bcrypt
+    # config.encryptor = :sha512
+
+    # ==> Scopes configuration
+    # Turn scoped views on. Before rendering "sessions/new", it will first check for
+    # "users/sessions/new". It's turned off by default because it's slower if you
+    # are using only default views.
+    # config.scoped_views = false
+
+    # Configure the default scope given to Warden. By default it's the first
+    # devise role declared in your routes (usually :user).
+    # config.default_scope = :user
+
+    # Set this configuration to false if you want /users/sign_out to sign out
+    # only the current scope. By default, Devise signs out all scopes.
+    # config.sign_out_all_scopes = true
+
+    # ==> Navigation configuration
+    # Lists the formats that should be treated as navigational. Formats like
+    # :html, should redirect to the sign in page when the user does not have
+    # access, but formats like :xml or :json, should return 401.
+    #
+    # If you have any extra navigational formats, like :iphone or :mobile, you
+    # should add them to the navigational formats lists.
+    #
+    # The "*/*" below is required to match Internet Explorer requests.
+    # config.navigational_formats = ['*/*', :html]
+
+    # The default HTTP method used to sign out a resource. Default is :delete.
+    config.sign_out_via = :get
+
+    # ==> OmniAuth
+    # Add a new OmniAuth provider. Check the wiki for more information on setting
+    # up on your models and hooks.
+    # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+    Avalon::Authentication::Providers.each do |provider|
+      if provider[:provider] == :lti
+	provider[:params].merge!({consumers: Avalon::Lti::Configuration})
+      end
+      if provider[:provider] == :identity
+	provider[:params].merge!({
+				   on_login: AuthFormsController.action(:render_identity_request_form),
+				   on_registration: AuthFormsController.action(:render_identity_registration_form),
+				   on_failed_registration: AuthFormsController.action(:render_form_with_errors)
+				 })
+      end
+      params = provider[:params]
+      params = [params] unless params.is_a?(Array)
+      begin
+	require "omniauth/#{provider[:provider]}"
+      rescue LoadError
+	require "omniauth-#{provider[:provider]}"
+      end
+      config.omniauth provider[:provider], *params
     end
-    if provider[:provider] == :identity
-      provider[:params].merge!({
-                                 on_login: AuthFormsController.action(:render_identity_request_form),
-                                 on_registration: AuthFormsController.action(:render_identity_registration_form),
-                                 on_failed_registration: AuthFormsController.action(:render_form_with_errors)
-                               })
-    end
-    params = provider[:params]
-    params = [params] unless params.is_a?(Array)
-    begin
-      require "omniauth/#{provider[:provider]}"
-    rescue LoadError
-      require "omniauth-#{provider[:provider]}"
-    end
-    config.omniauth provider[:provider], *params
-  end
 
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-  #   manager.intercept_401 = false
-  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
-  # end
-
-  # ==> Mountable engine configurations
-  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
-  # is mountable, there are some extra configurations to be taken into account.
-  # The following options are available, assuming the engine is mounted as:
-  #
-  #     mount MyEngine, at: '/my_engine'
-  #
-  # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
-  #
-  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
-  # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = '/my_engine/users/auth'
-  OmniAuth.config.logger = Rails.logger
-end
+    # ==> Warden configuration
+    # If you want to use other strategies, that are not supported by Devise, or
+    # change the failure app, you can configure them inside the config.warden block.
+    #
+    # config.warden do |manager|
+    #   manager.intercept_401 = false
+    #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+    # end
+
+    # ==> Mountable engine configurations
+    # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+    # is mountable, there are some extra configurations to be taken into account.
+    # The following options are available, assuming the engine is mounted as:
+    #
+    #     mount MyEngine, at: '/my_engine'
+    #
+    # The router that invoked `devise_for`, in the example above, would be:
+    # config.router_name = :my_engine
+    #
+    # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+    # so you need to do it manually. For the users scope, it would be:
+    # config.omniauth_path_prefix = '/my_engine/users/auth'
+    OmniAuth.config.logger = Rails.logger
+  end
 
-# Override script_name to always return empty string and avoid looking in @env
-# This override is needed due to our direct rendering of the identity login form in AuthFormsController
-# which doesn't initialize @env leading to a NoMethodError when trying read a hash value from it.
-OmniAuth::Strategies::Identity.class_eval do
-  def script_name
-    ''
+  # Override script_name to always return empty string and avoid looking in @env
+  # This override is needed due to our direct rendering of the identity login form in AuthFormsController
+  # which doesn't initialize @env leading to a NoMethodError when trying read a hash value from it.
+  OmniAuth::Strategies::Identity.class_eval do
+    def script_name
+      ''
+    end
   end
 end
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 4a994e1e7b..adc6568ce8 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+# Configure parameters to be filtered from the log file. 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
+]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 65a790826f..81b2151426 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -4,9 +4,9 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb
new file mode 100644
index 0000000000..9526b835ab
--- /dev/null
+++ b/config/initializers/new_framework_defaults_6_1.rb
@@ -0,0 +1,67 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.1 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Support for inversing belongs_to -> has_many Active Record associations.
+# Rails.application.config.active_record.has_many_inversing = true
+
+# Track Active Storage variants in the database.
+# Rails.application.config.active_storage.track_variants = true
+
+# Apply random variation to the delay when retrying failed jobs.
+# Rails.application.config.active_job.retry_jitter = 0.15
+
+# Stop executing `after_enqueue`/`after_perform` callbacks if
+# `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
+# Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
+
+# Specify cookies SameSite protection level: either :none, :lax, or :strict.
+#
+# This change is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.1.
+# Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
+
+# Generate CSRF tokens that are encoded in URL-safe Base64.
+#
+# This change is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.1.
+# Rails.application.config.action_controller.urlsafe_csrf_tokens = true
+
+# Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an
+# UTC offset or a UTC time.
+# ActiveSupport.utc_to_local_returns_utc_offset_times = true
+
+# Change the default HTTP status code to `308` when redirecting non-GET/HEAD
+# requests to HTTPS in `ActionDispatch::SSL` middleware.
+# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
+
+# Use new connection handling API. For most applications this won't have any
+# effect. For applications using multiple databases, this new API provides
+# support for granular connection swapping.
+# Rails.application.config.active_record.legacy_connection_handling = false
+
+# Make `form_with` generate non-remote forms by default.
+# Rails.application.config.action_view.form_with_generates_remote_forms = false
+
+# Set the default queue name for the analysis job to the queue adapter default.
+# Rails.application.config.active_storage.queues.analysis = nil
+
+# Set the default queue name for the purge job to the queue adapter default.
+# Rails.application.config.active_storage.queues.purge = nil
+
+# Set the default queue name for the incineration job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.incineration = nil
+
+# Set the default queue name for the routing job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.routing = nil
+
+# Set the default queue name for the mail deliver job to the queue adapter default.
+# Rails.application.config.action_mailer.deliver_later_queue_name = nil
+
+# Generate a `Link` header that gives a hint to modern browsers about
+# preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`.
+# Rails.application.config.action_view.preload_links_header = true
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
new file mode 100644
index 0000000000..4d580245a5
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_0.rb
@@ -0,0 +1,135 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.0 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.0`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# `button_to` view helper will render `<button>` element, regardless of whether
+# or not the content is passed as the first argument or as a block.
+# Rails.application.config.action_view.button_to_generates_button_tag = true
+
+# `stylesheet_link_tag` view helper will not render the media attribute by default.
+# Rails.application.config.action_view.apply_stylesheet_media_default = false
+
+# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
+# Changing this default means invalidate all encrypted messages generated by
+# your application and, all the encrypted cookies. Only change this after you
+# rotated all the messages using the key rotator.
+#
+# See upgrading guide for more information on how to build a rotator.
+# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
+# Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
+
+# Change the digest class for ActiveSupport::Digest.
+# Changing this default means that for example Etags change and
+# various cache keys leading to cache invalidation.
+# Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
+
+# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
+# implementation.
+# Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
+
+# Calls `Rails.application.executor.wrap` around test cases.
+# This makes test cases behave closer to an actual request or job.
+# Several features that are normally disabled in test, such as Active Record query cache
+# and asynchronous queries will then be enabled.
+# Rails.application.config.active_support.executor_around_test_case = true
+
+# Define the isolation level of most of Rails internal state.
+# If you use a fiber based server or job processor, you should set it to `:fiber`.
+# Otherwise the default of `:thread` if preferable.
+# Rails.application.config.active_support.isolation_level = :thread
+
+# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
+# Rails.application.config.action_mailer.smtp_timeout = 5
+
+# The ActiveStorage video previewer will now use scene change detection to generate
+# better preview images (rather than the previous default of using the first frame
+# of the video).
+# Rails.application.config.active_storage.video_preview_arguments =
+#   "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
+
+# Automatically infer `inverse_of` for associations with a scope.
+# Rails.application.config.active_record.automatic_scope_inversing = true
+
+# Raise when running tests if fixtures contained foreign key violations
+# Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
+
+# Disable partial inserts.
+# This default means that all columns will be referenced in INSERT queries
+# regardless of whether they have a default or not.
+# Rails.application.config.active_record.partial_inserts = false
+
+# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
+# Rails.application.config.action_controller.raise_on_open_redirects = true
+
+# Change the variant processor for Active Storage.
+# Changing this default means updating all places in your code that
+# generate variants to use image processing macros and ruby-vips
+# operations. See the upgrading guide for detail on the changes required.
+# The `:mini_magick` option is not deprecated; it's fine to keep using it.
+# Rails.application.config.active_storage.variant_processor = :vips
+
+# Enable parameter wrapping for JSON.
+# Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
+# To disable parameter wrapping entirely, set this config to `false`.
+# Rails.application.config.action_controller.wrap_parameters_by_default = true
+
+# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
+# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
+#
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
+# more information.
+# Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
+
+# Change the default headers to disable browsers' flawed legacy XSS protection.
+# Rails.application.config.action_dispatch.default_headers = {
+#   "X-Frame-Options" => "SAMEORIGIN",
+#   "X-XSS-Protection" => "0",
+#   "X-Content-Type-Options" => "nosniff",
+#   "X-Download-Options" => "noopen",
+#   "X-Permitted-Cross-Domain-Policies" => "none",
+#   "Referrer-Policy" => "strict-origin-when-cross-origin"
+# }
+
+
+# ** Please read carefully, this must be configured in config/application.rb **
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 6.1 applications.
+# Only change this value after your application is fully deployed to Rails 7.0
+# and you have no plans to rollback.
+# When you're ready to change format, add this to `config/application.rb` (NOT this file):
+#  config.active_support.cache_format_version = 7.0
+
+
+# Cookie serializer: 2 options
+# 
+# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
+# is `:marshal`. The default for new apps is `:json`.
+#
+# Rails.application.config.action_dispatch.cookies_serializer = :json
+#
+#
+# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
+# 
+# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
+# re-writes them in the JSON format.
+# 
+# It is fine to use `:hybrid` long term; you should do that until you're confident *all* your cookies
+# have been converted to JSON. To keep using `:hybrid` long term, move this config to its own
+# initializer or to `config/application.rb`.
+#
+# Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+#
+#
+# If your cookies can't yet be serialized to JSON, keep using `:marshal` for backward-compatibility.
+#
+# If you have configured the serializer elsewhere, you can remove this section of the file.
+# 
+# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
new file mode 100644
index 0000000000..00f64d71b0
--- /dev/null
+++ b/config/initializers/permissions_policy.rb
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end
diff --git a/config/initializers/policy_aware_modification.rb b/config/initializers/policy_aware_modification.rb
index f77f8a82e0..40e175ef9f 100644
--- a/config/initializers/policy_aware_modification.rb
+++ b/config/initializers/policy_aware_modification.rb
@@ -43,4 +43,19 @@ def self.post(query, args = {})
   def self.default_http_method
     ActiveFedora.solr_config.fetch(:http_method, :post).to_sym
   end
+
+  def self.count(query, args = {})
+    args = args.merge(rows: 0)
+    method = args.delete(:method) || default_http_method
+
+    result = case method
+	     when :get
+	       get(query, args)
+	     when :post
+	       post(query, args)
+	     else
+	       raise "Unsupported HTTP method for querying SolrService (#{method.inspect})"
+	     end
+    result['response']['numFound'].to_i
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 99a0b74db9..12e0482561 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -158,6 +158,7 @@
       get :captions
       get :waveform
       match ':quality.m3u8', to: 'master_files#hls_manifest', via: [:get], as: :hls_manifest
+      get 'caption_manifest'
       get 'structure', to: 'master_files#structure', constraints: { format: 'json' }
       post 'structure', to: 'master_files#set_structure', constraints: { format: 'json' }
       delete 'structure', to: 'master_files#delete_structure', constraints: { format: 'json' }
diff --git a/config/settings.yml b/config/settings.yml
index 7ae15aaeb0..7bcda7e282 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -100,3 +100,7 @@ controlled_digital_lending:
   # Choose whether every collection has CDL enabled or disabled by default
   collections_enabled: false
   default_lending_period: 'P14D' # ISO8601 duration format: P14D == 14.days, PT8H == 8.hours, etc.
+caption_default:
+  # Language should be 2 or 3 letter ISO 639 codes
+  language: 'en'
+  name: 'English'
diff --git a/config/settings/test.yml b/config/settings/test.yml
index dee52d3b3a..329396e22c 100644
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -4,11 +4,6 @@ dropbox:
   upload_uri: smb://test.host/dropbox
 auth:
   configuration:
-    - :name: Avalon Test Auth
-      :provider: :identity
-      :params:
-        :fields:
-          - :email
     - :name: Avalon Lti OAuth
       :provider: :lti
       :hidden: true
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 5c8d45ff66..5e85c723ee 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -14,6 +14,7 @@
   - mailers
   - master_file_management_move
   - master_file_management_delete
+  - media_object_indexing
   - reindex
   - s3_split
   - solr_backup
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index d16d9af743..74695855d3 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -1,3 +1,6 @@
 const { environment } = require('@rails/webpacker')
 
+// Preventing Babel from transpiling NodeModules packages
+environment.loaders.delete('nodeModules');
+
 module.exports = environment
diff --git a/db/migrate/20230208162500_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20230208162500_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 0000000000..a15c6ce8e5
--- /dev/null
+++ b/db/migrate/20230208162500_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,22 @@
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+  def up
+    return unless table_exists?(:active_storage_blobs)
+
+    unless column_exists?(:active_storage_blobs, :service_name)
+      add_column :active_storage_blobs, :service_name, :string
+
+      if configured_service = ActiveStorage::Blob.service.name
+        ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+      end
+
+      change_column :active_storage_blobs, :service_name, :string, null: false
+    end
+  end
+
+  def down
+    return unless table_exists?(:active_storage_blobs)
+
+    remove_column :active_storage_blobs, :service_name
+  end
+end
diff --git a/db/migrate/20230208162501_create_active_storage_variant_records.active_storage.rb b/db/migrate/20230208162501_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 0000000000..94ac83af0b
--- /dev/null
+++ b/db/migrate/20230208162501_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,27 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    # Use Active Record's configured type for primary key
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
+      t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_key_type
+      config = Rails.configuration.generators
+      config.options[config.orm][:primary_key_type] || :primary_key
+    end
+
+    def blobs_primary_key_type
+      pkey_name = connection.primary_key(:active_storage_blobs)
+      pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
+      pkey_column.bigint? ? :bigint : pkey_column.type
+    end
+end
diff --git a/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb b/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb
index dd03f4d153..4595b9cc22 100644
--- a/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb
+++ b/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/authentication.rb b/lib/avalon/authentication.rb
index e681b4a254..bf2cbf4397 100644
--- a/lib/avalon/authentication.rb
+++ b/lib/avalon/authentication.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch.rb b/lib/avalon/batch.rb
index 9c309848ef..2ac1e3d94b 100644
--- a/lib/avalon/batch.rb
+++ b/lib/avalon/batch.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch/entry.rb b/lib/avalon/batch/entry.rb
index 118d75e2a8..ac8cc1338b 100644
--- a/lib/avalon/batch/entry.rb
+++ b/lib/avalon/batch/entry.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch/file_manifest.rb b/lib/avalon/batch/file_manifest.rb
index c1ea692d52..bc692b7bcf 100644
--- a/lib/avalon/batch/file_manifest.rb
+++ b/lib/avalon/batch/file_manifest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch/ingest.rb b/lib/avalon/batch/ingest.rb
index 5daa7e3418..71182e94f3 100644
--- a/lib/avalon/batch/ingest.rb
+++ b/lib/avalon/batch/ingest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch/manifest.rb b/lib/avalon/batch/manifest.rb
index efda7bf32d..06cd42d519 100644
--- a/lib/avalon/batch/manifest.rb
+++ b/lib/avalon/batch/manifest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch/package.rb b/lib/avalon/batch/package.rb
index b42a8619c0..2ba8b03947 100644
--- a/lib/avalon/batch/package.rb
+++ b/lib/avalon/batch/package.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/batch/s3_manifest.rb b/lib/avalon/batch/s3_manifest.rb
index 4f86f87d62..0ce85db445 100644
--- a/lib/avalon/batch/s3_manifest.rb
+++ b/lib/avalon/batch/s3_manifest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/bib_retriever.rb b/lib/avalon/bib_retriever.rb
index 6197822a9e..b14433c21f 100644
--- a/lib/avalon/bib_retriever.rb
+++ b/lib/avalon/bib_retriever.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/bib_retriever/sru.rb b/lib/avalon/bib_retriever/sru.rb
index 64aed4f4a4..0d1438d3a4 100644
--- a/lib/avalon/bib_retriever/sru.rb
+++ b/lib/avalon/bib_retriever/sru.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/bib_retriever/zoom.rb b/lib/avalon/bib_retriever/zoom.rb
index 176448c963..dc083c3d62 100644
--- a/lib/avalon/bib_retriever/zoom.rb
+++ b/lib/avalon/bib_retriever/zoom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/build_utils.rb b/lib/avalon/build_utils.rb
index 628be5dace..1b2b3c3fb7 100644
--- a/lib/avalon/build_utils.rb
+++ b/lib/avalon/build_utils.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/configuration.rb b/lib/avalon/configuration.rb
index cc4a386dc9..ddd4dd0899 100644
--- a/lib/avalon/configuration.rb
+++ b/lib/avalon/configuration.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/lib/avalon/controlled_vocabulary.rb b/lib/avalon/controlled_vocabulary.rb
index b2b4989109..2661489f0c 100644
--- a/lib/avalon/controlled_vocabulary.rb
+++ b/lib/avalon/controlled_vocabulary.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/controller/controller_behavior.rb b/lib/avalon/controller/controller_behavior.rb
index 10ef2fad24..298996917a 100644
--- a/lib/avalon/controller/controller_behavior.rb
+++ b/lib/avalon/controller/controller_behavior.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/dropbox.rb b/lib/avalon/dropbox.rb
index 24dce5d6f3..0a626262fe 100644
--- a/lib/avalon/dropbox.rb
+++ b/lib/avalon/dropbox.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -25,7 +25,7 @@ def initialize(root, collection)
     # Returns available files in the dropbox
     def all
       FileUtils.mkdir_p @base_directory
-      return nil if @base_directory.blank? or not Dir.exists?(@base_directory)
+      return nil if @base_directory.blank? or not Dir.exist?(@base_directory)
       contents = Dir.entries(@base_directory).reject { |fn| fn.start_with?('.') }
       open_files = find_open_files(contents)
       files = []
@@ -52,7 +52,7 @@ def all
     # Compares id against hash of each file's full path and return the path that matches
     # Pretty horrible, should destroy
     def find(id)
-      return nil if @base_directory.blank? or not Dir.exists?(@base_directory)
+      return nil if @base_directory.blank? or not Dir.exist?(@base_directory)
 
       Dir.entries(@base_directory).each do |path|
         full_path = File.join( @base_directory, path)
diff --git a/lib/avalon/elastic_transcoder.rb b/lib/avalon/elastic_transcoder.rb
index fb21b93acc..ba26f215f1 100644
--- a/lib/avalon/elastic_transcoder.rb
+++ b/lib/avalon/elastic_transcoder.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/elastic_transcoder_encode.rb b/lib/avalon/elastic_transcoder_encode.rb
index 5adf50ab62..5bdf990cc5 100644
--- a/lib/avalon/elastic_transcoder_encode.rb
+++ b/lib/avalon/elastic_transcoder_encode.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/errors.rb b/lib/avalon/errors.rb
index d9c66050a1..877f0f3222 100644
--- a/lib/avalon/errors.rb
+++ b/lib/avalon/errors.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/lib/avalon/file_resolver.rb b/lib/avalon/file_resolver.rb
index 19dcd96f50..a1ef8f9fe9 100644
--- a/lib/avalon/file_resolver.rb
+++ b/lib/avalon/file_resolver.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/intercom.rb b/lib/avalon/intercom.rb
index bd3c5d6db6..c21bd96f49 100644
--- a/lib/avalon/intercom.rb
+++ b/lib/avalon/intercom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/m3u8_reader.rb b/lib/avalon/m3u8_reader.rb
index d7d6c7953c..41a0ded652 100644
--- a/lib/avalon/m3u8_reader.rb
+++ b/lib/avalon/m3u8_reader.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/role_controls.rb b/lib/avalon/role_controls.rb
index 13ec51c322..c99718ed65 100644
--- a/lib/avalon/role_controls.rb
+++ b/lib/avalon/role_controls.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/routing/can_constraint.rb b/lib/avalon/routing/can_constraint.rb
index a7ffa1b05f..a513661a4b 100644
--- a/lib/avalon/routing/can_constraint.rb
+++ b/lib/avalon/routing/can_constraint.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/sanitizer.rb b/lib/avalon/sanitizer.rb
index cb23edbe59..9200b5194f 100644
--- a/lib/avalon/sanitizer.rb
+++ b/lib/avalon/sanitizer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/solr_config_uploader.rb b/lib/avalon/solr_config_uploader.rb
index cdef16111f..272da81889 100644
--- a/lib/avalon/solr_config_uploader.rb
+++ b/lib/avalon/solr_config_uploader.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/stream_mapper.rb b/lib/avalon/stream_mapper.rb
index 6e8803eb1a..df81efb2c2 100644
--- a/lib/avalon/stream_mapper.rb
+++ b/lib/avalon/stream_mapper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/variations_mapping_service.rb b/lib/avalon/variations_mapping_service.rb
index c49270cab7..d5a20fc258 100644
--- a/lib/avalon/variations_mapping_service.rb
+++ b/lib/avalon/variations_mapping_service.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/variations_playlist_importer.rb b/lib/avalon/variations_playlist_importer.rb
index d16fd0ab83..a237e608ab 100644
--- a/lib/avalon/variations_playlist_importer.rb
+++ b/lib/avalon/variations_playlist_importer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/avalon/variations_timeline_importer.rb b/lib/avalon/variations_timeline_importer.rb
index 8dfd5bb461..a7a7d2e558 100644
--- a/lib/avalon/variations_timeline_importer.rb
+++ b/lib/avalon/variations_timeline_importer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/capistrano/tasks/glob.rake b/lib/capistrano/tasks/glob.rake
index 22c38fff59..74dbb5738b 100644
--- a/lib/capistrano/tasks/glob.rake
+++ b/lib/capistrano/tasks/glob.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/capistrano/tasks/hls.rake b/lib/capistrano/tasks/hls.rake
index 6c9e169d40..2a8004b38d 100644
--- a/lib/capistrano/tasks/hls.rake
+++ b/lib/capistrano/tasks/hls.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/day_hour_string.rb b/lib/day_hour_string.rb
index 2550144ab9..ff5f02497e 100644
--- a/lib/day_hour_string.rb
+++ b/lib/day_hour_string.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/lib/hydra/multiple_policy_aware_ability.rb b/lib/hydra/multiple_policy_aware_ability.rb
index 01beb0814b..a71714d473 100644
--- a/lib/hydra/multiple_policy_aware_ability.rb
+++ b/lib/hydra/multiple_policy_aware_ability.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb b/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
index e0612b9a79..2226c15d2c 100644
--- a/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
+++ b/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/string_additions.rb b/lib/string_additions.rb
index 9040ebc6c7..72f2629968 100644
--- a/lib/string_additions.rb
+++ b/lib/string_additions.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/tasks/avalon.rake b/lib/tasks/avalon.rake
index 9b02e89a2a..53269d430b 100644
--- a/lib/tasks/avalon.rake
+++ b/lib/tasks/avalon.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/tasks/avalon_api.rake b/lib/tasks/avalon_api.rake
index 67ebf5f7b7..7fded0342c 100644
--- a/lib/tasks/avalon_api.rake
+++ b/lib/tasks/avalon_api.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/tasks/avalon_tools.rake b/lib/tasks/avalon_tools.rake
index e7c46720b5..1d57383f4f 100644
--- a/lib/tasks/avalon_tools.rake
+++ b/lib/tasks/avalon_tools.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/tasks/aws.rake b/lib/tasks/aws.rake
index c02456f042..92f1fd317a 100644
--- a/lib/tasks/aws.rake
+++ b/lib/tasks/aws.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/tasks/wipeout.rake b/lib/tasks/wipeout.rake
index 5297c74bdd..35d0e6fd7f 100644
--- a/lib/tasks/wipeout.rake
+++ b/lib/tasks/wipeout.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/lib/tasks/zookeeper.rake b/lib/tasks/zookeeper.rake
index bc9c6d8d3c..cedbfa07ec 100644
--- a/lib/tasks/zookeeper.rake
+++ b/lib/tasks/zookeeper.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/script/avalon_image_tags.rb b/script/avalon_image_tags.rb
index d5630ece94..58b291a23d 100755
--- a/script/avalon_image_tags.rb
+++ b/script/avalon_image_tags.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/script/avalon_push_images b/script/avalon_push_images
index 23a2e9a3ab..febd4c3135 100755
--- a/script/avalon_push_images
+++ b/script/avalon_push_images
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/script/avalon_version.rb b/script/avalon_version.rb
index 879b2aa95b..2f0495ebb9 100755
--- a/script/avalon_version.rb
+++ b/script/avalon_version.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/script/waveform_backfill.rb b/script/waveform_backfill.rb
old mode 100644
new mode 100755
index a44de745bd..8bc362eeb9
--- a/script/waveform_backfill.rb
+++ b/script/waveform_backfill.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/admin_collections_controller_spec.rb b/spec/controllers/admin_collections_controller_spec.rb
index 9ed4f2e6ee..af9b659c6f 100644
--- a/spec/controllers/admin_collections_controller_spec.rb
+++ b/spec/controllers/admin_collections_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index c5f76c48a7..1d8dc68f47 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/avalon_marker_controller_spec.rb b/spec/controllers/avalon_marker_controller_spec.rb
index b2a1bbdb43..1b714fb14f 100644
--- a/spec/controllers/avalon_marker_controller_spec.rb
+++ b/spec/controllers/avalon_marker_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/bookmarks_controller_spec.rb b/spec/controllers/bookmarks_controller_spec.rb
index 6fa280081d..cdcf526fc9 100644
--- a/spec/controllers/bookmarks_controller_spec.rb
+++ b/spec/controllers/bookmarks_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
index 945f1a56d6..c16e818c70 100644
--- a/spec/controllers/catalog_controller_spec.rb
+++ b/spec/controllers/catalog_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -192,6 +192,8 @@
         @master_file = FactoryBot.create(:master_file, :with_structure, media_object: @media_object, title: 'Test Label')
         @media_object.ordered_master_files += [@master_file]
         @media_object.save!
+        # Explicitly run indexing job to ensure fields are indexed for structure searching
+        MediaObjectIndexingJob.perform_now(@media_object.id)
       end
       it "should find results based upon structure" do
         get 'index', params: { q: 'CD 1' }
diff --git a/spec/controllers/collections_controller_spec.rb b/spec/controllers/collections_controller_spec.rb
index 060331dbbd..a0911aa689 100644
--- a/spec/controllers/collections_controller_spec.rb
+++ b/spec/controllers/collections_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/derivative_controller_spec.rb b/spec/controllers/derivative_controller_spec.rb
index 5db32e6ba3..39abaa5919 100644
--- a/spec/controllers/derivative_controller_spec.rb
+++ b/spec/controllers/derivative_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/controllers/dropbox_controller_spec.rb b/spec/controllers/dropbox_controller_spec.rb
index 567b93b14e..c84193fc93 100644
--- a/spec/controllers/dropbox_controller_spec.rb
+++ b/spec/controllers/dropbox_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/encode_records_controller_spec.rb b/spec/controllers/encode_records_controller_spec.rb
index 839c11d877..bc4f4814a1 100644
--- a/spec/controllers/encode_records_controller_spec.rb
+++ b/spec/controllers/encode_records_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index e32755a80f..c4533315ba 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/master_files_controller_spec.rb b/spec/controllers/master_files_controller_spec.rb
index 4d2f284919..13d5c63001 100644
--- a/spec/controllers/master_files_controller_spec.rb
+++ b/spec/controllers/master_files_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -632,6 +632,37 @@ class << file
     end
   end
 
+  describe '#caption_manifest' do
+    let(:media_object) { FactoryBot.create(:published_media_object) }
+    let(:master_file) { FactoryBot.create(:master_file, :with_captions, media_object: media_object) }
+    let(:public_media_object) { FactoryBot.create(:published_media_object, visibility: 'public') }
+    let(:public_master_file) { FactoryBot.create(:master_file, :with_captions, media_object: public_media_object) }
+
+    context 'master file has been deleted' do
+      before do
+        allow(MasterFile).to receive(:find).and_raise(Ldp::Gone)
+      end
+
+      it 'returns gone (403)' do
+        expect(get('caption_manifest', params: { id: master_file.id }, xhr: true)).to have_http_status(:gone)
+      end
+    end
+
+    it 'returns unauthorized (401) if cannot read the master file' do
+      expect(get('caption_manifest', params: { id: master_file.id }, xhr: true)).to have_http_status(:unauthorized)
+    end
+
+    it 'returns the caption manifest' do
+      login_as :administrator
+      expect(get('caption_manifest', params: { id: master_file.id }, xhr: true)).to have_http_status(:ok)
+      expect(response.content_type).to eq 'application/x-mpegURL; charset=utf-8'
+    end
+
+    it 'returns a manifest if public' do
+      expect(get('caption_manifest', params: { id: public_master_file.id }, xhr: true)).to have_http_status(:ok)
+    end
+  end
+
   describe '#move' do
     let(:master_file) { FactoryBot.create(:master_file, :with_media_object) }
     let(:target_media_object) { FactoryBot.create(:media_object) }
diff --git a/spec/controllers/media_objects_controller_spec.rb b/spec/controllers/media_objects_controller_spec.rb
index 6bb6709475..92cfa97e7b 100644
--- a/spec/controllers/media_objects_controller_spec.rb
+++ b/spec/controllers/media_objects_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -296,6 +296,13 @@
           expect(JSON.parse(response.body)["errors"].class).to eq Array
           expect(JSON.parse(response.body)["errors"].first.class).to eq String
         end
+        it "should respond with 422 if collection param not present" do
+          post 'create', params: { format: 'json' }
+          expect(response.status).to eq(422)
+          expect(JSON.parse(response.body)).to include('errors')
+          expect(JSON.parse(response.body)["errors"].class).to eq Array
+          expect(JSON.parse(response.body)["errors"].first.class).to eq String
+        end
         it "should create a new media_object" do
           # master_file_obj = FactoryBot.create(:master_file, master_file.slice(:files))
           media_object = FactoryBot.create(:media_object)#, master_files: [master_file_obj])
@@ -446,14 +453,15 @@
     end
     describe "#update" do
       context 'using api' do
-        let(:administrator) { FactoryBot.create(:administrator) }
+        let(:user) { FactoryBot.create(:administrator) }
+        let(:media_object) { FactoryBot.create(:media_object, :with_master_file) }
 
         before(:each) do
-          ApiToken.create token: 'secret_token', username: administrator.username, email: administrator.email
+          ApiToken.create token: 'secret_token', username: user.username, email: user.email
           request.headers['Avalon-Api-Key'] = 'secret_token'
           allow_any_instance_of(MasterFile).to receive(:get_ffmpeg_frame_data).and_return('some data')
         end
-        let!(:media_object) { FactoryBot.create(:media_object, :with_master_file) }
+
         it "should route json format to #json_update" do
           assert_routing({ path: 'media_objects/1.json', method: :put },
              { controller: 'media_objects', action: 'json_update', id: '1', format: 'json' })
@@ -513,6 +521,39 @@
           expect(JSON.parse(response.body)["errors"].class).to eq Array
           expect(JSON.parse(response.body)["errors"].first.class).to eq String
         end
+
+        context "as an authorized non-admin user" do
+          let(:user) { FactoryBot.create(:manager) }
+          let(:collection) { FactoryBot.create(:collection, managers: [user.username]) }
+          let(:media_object) { FactoryBot.create(:media_object, collection: collection) }
+
+          it "updates metadata" do
+	    old_title = media_object.title
+	    put 'json_update', params: { format: 'json', id: media_object.id, fields: {title: old_title+'new'}, collection_id: media_object.collection_id }
+	    expect(JSON.parse(response.body)['id'].class).to eq String
+	    expect(JSON.parse(response.body)).not_to include('errors')
+	    media_object.reload
+	    expect(media_object.title).to eq old_title+'new'
+          end
+        end
+
+        context "collection_id parameter" do
+          it "updates metadata without collection_id" do
+	    old_title = media_object.title
+	    put 'json_update', params: { format: 'json', id: media_object.id, fields: {title: old_title+'new'} }
+	    expect(JSON.parse(response.body)['id'].class).to eq String
+	    expect(JSON.parse(response.body)).not_to include('errors')
+	    media_object.reload
+	    expect(media_object.title).to eq old_title+'new'
+          end
+	  it "should respond with 422 if collection not found" do
+	    put 'json_update', params: { format: 'json', id: media_object.id, collection_id: "doesnt_exist" }
+	    expect(response.status).to eq(422)
+	    expect(JSON.parse(response.body)).to include('errors')
+	    expect(JSON.parse(response.body)["errors"].class).to eq Array
+	    expect(JSON.parse(response.body)["errors"].first.class).to eq String
+	  end
+        end
       end
     end
   end
@@ -773,10 +814,10 @@
       it "should choose the correct default master_file" do
         mf1 = FactoryBot.create(:master_file, media_object: media_object)
         mf2 = FactoryBot.create(:master_file, media_object: media_object)
+        expect(media_object.ordered_master_files.to_a.first).to eq(mf1)
         media_object.ordered_master_files = media_object.ordered_master_files.to_a.reverse
         media_object.save!
         controller.instance_variable_set('@media_object', media_object)
-        expect(media_object.master_files.first).to eq(mf1)
         expect(media_object.ordered_master_files.to_a.first).to eq(mf2)
         expect(controller.send('set_active_file')).to eq(mf2)
       end
@@ -1217,7 +1258,7 @@
       delete :destroy, params: { id: media_object.id }
       expect(flash[:notice]).to include("media object deleted")
       expect(MediaObject.exists?(media_object.id)).to be_falsey
-      expect(MasterFile.exists?(media_object.master_files.first.id)).to be_falsey
+      expect(MasterFile.exists?(media_object.master_file_ids.first)).to be_falsey
     end
 
     it "should remove a MediaObject with multiple MasterFiles" do
@@ -1392,10 +1433,9 @@
     end
     it 'sets the MIME type' do
       media_object = FactoryBot.create(:media_object)
-      media_object.ordered_master_files += [FactoryBot.create(:master_file, :with_derivative)]
+      master_file = FactoryBot.create(:master_file, :with_derivative, media_object: media_object)
+      media_object.reload # Reload here to force reloading master file solr docs used in #set_media_types!
       media_object.set_media_types!
-      media_object.save
-      media_object.reload
       expect(media_object.format).to eq(["video/mp4"])
     end
 
@@ -1575,16 +1615,16 @@
       login_as :user
     end
     it "should render add_to_playlist_form with correct masterfile_id" do
-      get :add_to_playlist_form, params: { id: media_object.id, scope: 'master_file', masterfile_id: media_object.master_file_ids[0] }
+      get :add_to_playlist_form, params: { id: media_object.id, scope: 'master_file', masterfile_id: media_object.ordered_master_file_ids[0] }
       expect(response).to render_template(:_add_to_playlist_form)
-      expect(response.body).to include(media_object.master_file_ids[0])
+      expect(response.body).to include(media_object.ordered_master_file_ids[0])
     end
     it "should render the correct label for scope=master_file" do
-      get :add_to_playlist_form, params: { id: media_object.id, scope: 'master_file', masterfile_id: media_object.master_file_ids[0] }
+      get :add_to_playlist_form, params: { id: media_object.id, scope: 'master_file', masterfile_id: media_object.ordered_master_file_ids[0] }
       expect(response.body).to include('Add Section to Playlist')
     end
     it "should render the correct label for scope=media_object" do
-      get :add_to_playlist_form, params: { id: media_object.id, scope: 'media_object', masterfile_id: media_object.master_file_ids[0] }
+      get :add_to_playlist_form, params: { id: media_object.id, scope: 'media_object', masterfile_id: media_object.ordered_master_file_ids[0] }
       expect(response.body).to include('Add Item to Playlist')
     end
   end
@@ -1602,13 +1642,13 @@
 
     it "should create a single playlist_item for a single master_file" do
       expect {
-        post :add_to_playlist, params: { id: media_object.id, post: { playlist_id: playlist.id, masterfile_id: media_object.master_file_ids[0], playlistitem_scope: 'section' } }
+        post :add_to_playlist, params: { id: media_object.id, post: { playlist_id: playlist.id, masterfile_id: media_object.ordered_master_file_ids[0], playlistitem_scope: 'section' } }
       }.to change { playlist.items.count }.from(0).to(1)
       expect(playlist.items[0].title).to eq("#{media_object.title} - #{media_object.ordered_master_files.to_a[0].title}")
     end
     it "should create playlist_items for each span in a single master_file's structure" do
       expect {
-        post :add_to_playlist, params: { id: media_object.id, post: { playlist_id: playlist.id, masterfile_id: media_object.master_file_ids[1], playlistitem_scope: 'structure' } }
+        post :add_to_playlist, params: { id: media_object.id, post: { playlist_id: playlist.id, masterfile_id: media_object.ordered_master_file_ids[1], playlistitem_scope: 'structure' } }
       }.to change { playlist.items.count }.from(0).to(13)
       expect(playlist.items[0].title).to eq("Test Item - CD 1 - Copland, Three Piano Excerpts from Our Town - Track 1. Story of Our Town")
       expect(playlist.items[12].title).to eq("Test Item - CD 1 - Track 13. Copland, Danzon Cubano")
@@ -1631,7 +1671,7 @@
     it 'redirects with flash message when playlist is owned by another user' do
       login_as :user
       other_playlist = FactoryBot.create(:playlist)
-      post :add_to_playlist, params: { id: media_object.id, post: { playlist_id: other_playlist.id, masterfile_id: media_object.master_file_ids[0], playlistitem_scope: 'section' } }
+      post :add_to_playlist, params: { id: media_object.id, post: { playlist_id: other_playlist.id, masterfile_id: media_object.ordered_master_file_ids[0], playlistitem_scope: 'section' } }
       expect(response).to have_http_status(403)
       expect(JSON.parse(response.body).symbolize_keys).to eq({message: "<p>You are not authorized to update this playlist.</p>", status: 403})
     end
diff --git a/spec/controllers/objects_controller_spec.rb b/spec/controllers/objects_controller_spec.rb
index 1d16381bb6..6804a02e1d 100644
--- a/spec/controllers/objects_controller_spec.rb
+++ b/spec/controllers/objects_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
index a9796bae58..adc2df42b5 100644
--- a/spec/controllers/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/omniauth_callbacks_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -15,10 +15,29 @@
 require 'rails_helper'
 
 describe Users::OmniauthCallbacksController, type: :controller do
+  let(:identity_params) do
+    {
+      on_login: AuthFormsController.action(:render_identity_request_form),
+      on_registration: AuthFormsController.action(:render_identity_registration_form),
+      on_failed_registration: AuthFormsController.action(:render_form_with_errors),
+      fields: [:email]
+    }
+  end
+
   before do
     @request.env["devise.mapping"] = Devise.mappings[:user]
   end
 
+  around do |example|
+    @old_configs = Devise.omniauth_configs
+    Devise.omniauth(:identity, identity_params)
+    Rails.application.reload_routes!
+
+    example.run
+    Devise.class_variable_set(:@@omniauth_configs, @old_configs)
+    Rails.application.reload_routes!
+  end
+
   describe '#find_user' do
     let(:user) { FactoryBot.create(:user) }
 
diff --git a/spec/controllers/playlist_items_controller_spec.rb b/spec/controllers/playlist_items_controller_spec.rb
index 291bbece01..5549411ec8 100644
--- a/spec/controllers/playlist_items_controller_spec.rb
+++ b/spec/controllers/playlist_items_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/playlists_controller_spec.rb b/spec/controllers/playlists_controller_spec.rb
index 4994f7d4d4..a9b2373c9a 100644
--- a/spec/controllers/playlists_controller_spec.rb
+++ b/spec/controllers/playlists_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -466,7 +466,7 @@
       before :each do
         FactoryBot.reload
         FactoryBot.create(:playlist, title: "aardvark", user: user)
-        FactoryBot.create_list(:playlist, 9, user: user)
+        FactoryBot.create_list(:playlist, 9, title: 'bbbbb', user: user)
         FactoryBot.create(:playlist, title: "zzzebra", user: user)
       end
 
diff --git a/spec/controllers/samvera/persona/user_controller_spec.rb b/spec/controllers/samvera/persona/user_controller_spec.rb
index 0307d47ace..6dbca53c39 100644
--- a/spec/controllers/samvera/persona/user_controller_spec.rb
+++ b/spec/controllers/samvera/persona/user_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/controllers/supplemental_files_controller_spec.rb b/spec/controllers/supplemental_files_controller_spec.rb
index b5ed629ca7..2ca227c882 100644
--- a/spec/controllers/supplemental_files_controller_spec.rb
+++ b/spec/controllers/supplemental_files_controller_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/controllers/timelines_controller_spec.rb b/spec/controllers/timelines_controller_spec.rb
index e0b5795e03..e9dd16f73d 100644
--- a/spec/controllers/timelines_controller_spec.rb
+++ b/spec/controllers/timelines_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/controllers/vocabulary_controller_spec.rb b/spec/controllers/vocabulary_controller_spec.rb
index df0c6f8ad8..3f2245bbea 100644
--- a/spec/controllers/vocabulary_controller_spec.rb
+++ b/spec/controllers/vocabulary_controller_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/cypress/cypress.json b/spec/cypress/cypress.json
index e7fe6d8511..ea590d16e7 100644
--- a/spec/cypress/cypress.json
+++ b/spec/cypress/cypress.json
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/fixtures/example.json b/spec/cypress/fixtures/example.json
index b67c9f4b7a..179ecd0649 100644
--- a/spec/cypress/fixtures/example.json
+++ b/spec/cypress/fixtures/example.json
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/integration/auth_identity_spec.js b/spec/cypress/integration/auth_identity_spec.js
index b174e77b14..91c9358e42 100644
--- a/spec/cypress/integration/auth_identity_spec.js
+++ b/spec/cypress/integration/auth_identity_spec.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/integration/homepage_spec.js b/spec/cypress/integration/homepage_spec.js
index f5dd59ed12..c2d3c11c92 100644
--- a/spec/cypress/integration/homepage_spec.js
+++ b/spec/cypress/integration/homepage_spec.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/integration/media_object_spec.js b/spec/cypress/integration/media_object_spec.js
index f4cc203b95..23be92ae2f 100644
--- a/spec/cypress/integration/media_object_spec.js
+++ b/spec/cypress/integration/media_object_spec.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/integration/navigation_spec.js b/spec/cypress/integration/navigation_spec.js
index 316e767461..36b960d278 100644
--- a/spec/cypress/integration/navigation_spec.js
+++ b/spec/cypress/integration/navigation_spec.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/integration/playlist_spec.js b/spec/cypress/integration/playlist_spec.js
index c844bcd097..7344570d4d 100644
--- a/spec/cypress/integration/playlist_spec.js
+++ b/spec/cypress/integration/playlist_spec.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/integration/secure_routes_spec.js b/spec/cypress/integration/secure_routes_spec.js
index 7922bd1400..e1d3637751 100644
--- a/spec/cypress/integration/secure_routes_spec.js
+++ b/spec/cypress/integration/secure_routes_spec.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/plugins/index.js b/spec/cypress/plugins/index.js
index 63e3a8a155..0adeef0d6c 100644
--- a/spec/cypress/plugins/index.js
+++ b/spec/cypress/plugins/index.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js
index 22bb39afbb..337c7fa206 100644
--- a/spec/cypress/support/commands.js
+++ b/spec/cypress/support/commands.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/cypress/support/index.js b/spec/cypress/support/index.js
index 243f9f404d..130275221c 100644
--- a/spec/cypress/support/index.js
+++ b/spec/cypress/support/index.js
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/factories/avalon_clip.rb b/spec/factories/avalon_clip.rb
index 2616344425..f983e6243d 100644
--- a/spec/factories/avalon_clip.rb
+++ b/spec/factories/avalon_clip.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/avalon_marker.rb b/spec/factories/avalon_marker.rb
index 1f7b3a8250..b7510dfa28 100644
--- a/spec/factories/avalon_marker.rb
+++ b/spec/factories/avalon_marker.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/batch_entries.rb b/spec/factories/batch_entries.rb
index 444aabcf7f..f18b8c2fd9 100644
--- a/spec/factories/batch_entries.rb
+++ b/spec/factories/batch_entries.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/batch_registries.rb b/spec/factories/batch_registries.rb
index 8c4317ce56..068760a111 100644
--- a/spec/factories/batch_registries.rb
+++ b/spec/factories/batch_registries.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/checkouts.rb b/spec/factories/checkouts.rb
index c18deb9713..4ad0cd95cc 100644
--- a/spec/factories/checkouts.rb
+++ b/spec/factories/checkouts.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -20,4 +20,3 @@
     return_time { DateTime.now + 2.weeks }
   end
 end
-
diff --git a/spec/factories/collections.rb b/spec/factories/collections.rb
index cd6af973f1..75eaf0d2c0 100644
--- a/spec/factories/collections.rb
+++ b/spec/factories/collections.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/derivatives.rb b/spec/factories/derivatives.rb
index 2fac22363f..b56427d729 100644
--- a/spec/factories/derivatives.rb
+++ b/spec/factories/derivatives.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/encode.rb b/spec/factories/encode.rb
index ddbffa570e..b9fe51b44f 100644
--- a/spec/factories/encode.rb
+++ b/spec/factories/encode.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/encode_record.rb b/spec/factories/encode_record.rb
index 4faf6d1408..2dc6b7fdcc 100644
--- a/spec/factories/encode_record.rb
+++ b/spec/factories/encode_record.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb
index af8ad02be2..43a3c8bcec 100644
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/lease.rb b/spec/factories/lease.rb
index cbb3a55ace..60e8eb059c 100644
--- a/spec/factories/lease.rb
+++ b/spec/factories/lease.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/master_files.rb b/spec/factories/master_files.rb
index ce8a21bbdc..2d036eb24b 100644
--- a/spec/factories/master_files.rb
+++ b/spec/factories/master_files.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/media_objects.rb b/spec/factories/media_objects.rb
index 860326f2c3..1a1a2dcb76 100644
--- a/spec/factories/media_objects.rb
+++ b/spec/factories/media_objects.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/playlist.rb b/spec/factories/playlist.rb
index 326a12850a..4277b1e180 100644
--- a/spec/factories/playlist.rb
+++ b/spec/factories/playlist.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/playlist_item.rb b/spec/factories/playlist_item.rb
index 2b6f21993c..911646cddc 100644
--- a/spec/factories/playlist_item.rb
+++ b/spec/factories/playlist_item.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/supplemental_file.rb b/spec/factories/supplemental_file.rb
index 4ef1d4ad92..20a139902f 100644
--- a/spec/factories/supplemental_file.rb
+++ b/spec/factories/supplemental_file.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/timeline.rb b/spec/factories/timeline.rb
index f9c17b7459..80dea5dd52 100644
--- a/spec/factories/timeline.rb
+++ b/spec/factories/timeline.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index bc6f50fb22..657cf76ea4 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/features/auth_identity_spec.rb b/spec/features/auth_identity_spec.rb
index e87edb26d9..b43219042d 100644
--- a/spec/features/auth_identity_spec.rb
+++ b/spec/features/auth_identity_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/features/capybara_admin_collection_spec.rb b/spec/features/capybara_admin_collection_spec.rb
index 3d58f0900c..b309629c09 100644
--- a/spec/features/capybara_admin_collection_spec.rb
+++ b/spec/features/capybara_admin_collection_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/features/capybara_checkouts_spec.rb b/spec/features/capybara_checkouts_spec.rb
index 6734a21e78..854be733fb 100644
--- a/spec/features/capybara_checkouts_spec.rb
+++ b/spec/features/capybara_checkouts_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/features/capybara_homepage_spec.rb b/spec/features/capybara_homepage_spec.rb
index 21676f44ba..8e0f70ee67 100644
--- a/spec/features/capybara_homepage_spec.rb
+++ b/spec/features/capybara_homepage_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -79,9 +79,9 @@
 describe 'Sign in page' do
   it 'validates presence of items on login page' do
     visit '/users/sign_in'
-    expect(page).to have_content('Login:')
-    expect(page).to have_content('Password:')
-    expect(page).to have_link('Create an Identity')
+    expect(page).to have_content('Username or email')
+    expect(page).to have_content('Password')
+    expect(page).to have_link('Sign up')
     expect(page).to have_button('Connect')
   end
   it 'validates presence of items on register page' do
diff --git a/spec/features/capybara_navigation_spec.rb b/spec/features/capybara_navigation_spec.rb
index 5b5a17b302..24660463c2 100644
--- a/spec/features/capybara_navigation_spec.rb
+++ b/spec/features/capybara_navigation_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/features/capybara_playlist_spec.rb b/spec/features/capybara_playlist_spec.rb
index a8b3b5c88c..0638e6aaaa 100644
--- a/spec/features/capybara_playlist_spec.rb
+++ b/spec/features/capybara_playlist_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/features/login_redirect_spec.rb b/spec/features/login_redirect_spec.rb
index 88027f1dab..31d3c56149 100644
--- a/spec/features/login_redirect_spec.rb
+++ b/spec/features/login_redirect_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/features/media_object_spec.rb b/spec/features/media_object_spec.rb
index e96752ced6..215b8a6cb6 100644
--- a/spec/features/media_object_spec.rb
+++ b/spec/features/media_object_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/features/secure_routes_spec.rb b/spec/features/secure_routes_spec.rb
index cf0addca48..db27738136 100644
--- a/spec/features/secure_routes_spec.rb
+++ b/spec/features/secure_routes_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/fixtures/meow.json b/spec/fixtures/meow.json
index a53822b2b9..b9fb2ba571 100644
--- a/spec/fixtures/meow.json
+++ b/spec/fixtures/meow.json
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/fixtures/structure.json b/spec/fixtures/structure.json
index 3a765b72bf..f043b298f8 100644
--- a/spec/fixtures/structure.json
+++ b/spec/fixtures/structure.json
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/fixtures/structure_with_html.json b/spec/fixtures/structure_with_html.json
index ef62a62bbd..d617dfa4c9 100644
--- a/spec/fixtures/structure_with_html.json
+++ b/spec/fixtures/structure_with_html.json
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/fixtures/waveform.json b/spec/fixtures/waveform.json
index 0ae01f02fa..2292420354 100644
--- a/spec/fixtures/waveform.json
+++ b/spec/fixtures/waveform.json
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+ * Copyright 2011-2023, The Trustees of Indiana University and Northwestern
  *   University.  Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
  * 
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 85575a2038..95e8d354d4 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/helpers/media_objects_helper_spec.rb b/spec/helpers/media_objects_helper_spec.rb
index 79dcb7c616..701baea65b 100644
--- a/spec/helpers/media_objects_helper_spec.rb
+++ b/spec/helpers/media_objects_helper_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/helpers/security_helper_spec.rb b/spec/helpers/security_helper_spec.rb
index 75975b9e91..19f9145f4a 100644
--- a/spec/helpers/security_helper_spec.rb
+++ b/spec/helpers/security_helper_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/helpers/timelines_helper_spec.rb b/spec/helpers/timelines_helper_spec.rb
index 02a831b18e..2da979ce95 100644
--- a/spec/helpers/timelines_helper_spec.rb
+++ b/spec/helpers/timelines_helper_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/helpers/upload_form_helper_spec.rb b/spec/helpers/upload_form_helper_spec.rb
index 4d124f7982..fc78383ab5 100644
--- a/spec/helpers/upload_form_helper_spec.rb
+++ b/spec/helpers/upload_form_helper_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/active_encode_job_spec.rb b/spec/jobs/active_encode_job_spec.rb
index e075de9198..9f761baadc 100644
--- a/spec/jobs/active_encode_job_spec.rb
+++ b/spec/jobs/active_encode_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -22,7 +22,7 @@
 
     describe "perform" do
       it 'creates the active_encode job' do
-        expect(encoder_class).to receive(:create).with(input, master_file_id: master_file.id, preset: master_file.workflow_name).once
+        expect(encoder_class).to receive(:create).with(input, { master_file_id: master_file.id, preset: master_file.workflow_name }).once
         ActiveEncodeJobs::CreateEncodeJob.perform_now(input, master_file.id)
       end
 
diff --git a/spec/jobs/batch_scan_job_spec.rb b/spec/jobs/batch_scan_job_spec.rb
index 360fe7a21f..885dac182f 100644
--- a/spec/jobs/batch_scan_job_spec.rb
+++ b/spec/jobs/batch_scan_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/bulk_action_job_spec.rb b/spec/jobs/bulk_action_job_spec.rb
index 9d57bdc6a4..1b8609021d 100644
--- a/spec/jobs/bulk_action_job_spec.rb
+++ b/spec/jobs/bulk_action_job_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -122,6 +122,9 @@ def check_push(result)
         mo.reload
         expect(mo.read_users).to contain_exactly("co_user")
         expect(mo.read_groups).to contain_exactly("co_group", "public")
+        solr_doc = ActiveFedora::SolrService.query("id:#{mo.id}").first
+        expect(solr_doc["read_access_person_ssim"]).to contain_exactly("co_user")
+        expect(solr_doc["read_access_group_ssim"]).to contain_exactly("co_group", "public")
       end
     end
 
@@ -131,6 +134,9 @@ def check_push(result)
         mo.reload
         expect(mo.read_users).to contain_exactly("mo_user", "co_user")
         expect(mo.read_groups).to contain_exactly("mo_group", "co_group", "public")
+        solr_doc = ActiveFedora::SolrService.query("id:#{mo.id}").first
+        expect(solr_doc["read_access_person_ssim"]).to contain_exactly("mo_user", "co_user")
+        expect(solr_doc["read_access_group_ssim"]).to contain_exactly("mo_group", "co_group", "public")
       end
     end
   end
diff --git a/spec/jobs/cleanup_working_files_spec.rb b/spec/jobs/cleanup_working_files_spec.rb
index 0d9c51b73e..94d89f0d47 100644
--- a/spec/jobs/cleanup_working_files_spec.rb
+++ b/spec/jobs/cleanup_working_files_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/delete_course_job_spec.rb b/spec/jobs/delete_course_job_spec.rb
index 2d845fd497..ebe826eecf 100644
--- a/spec/jobs/delete_course_job_spec.rb
+++ b/spec/jobs/delete_course_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/delete_derivative_job_spec.rb b/spec/jobs/delete_derivative_job_spec.rb
index e17a8336c1..87ba027f4f 100644
--- a/spec/jobs/delete_derivative_job_spec.rb
+++ b/spec/jobs/delete_derivative_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/delete_dropbox_job_spec.rb b/spec/jobs/delete_dropbox_job_spec.rb
index c790056ca2..858079a0b9 100644
--- a/spec/jobs/delete_dropbox_job_spec.rb
+++ b/spec/jobs/delete_dropbox_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/ingest_batch_entry_job_spec.rb b/spec/jobs/ingest_batch_entry_job_spec.rb
index dd3998d04e..e0b84fac55 100644
--- a/spec/jobs/ingest_batch_entry_job_spec.rb
+++ b/spec/jobs/ingest_batch_entry_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/ingest_batch_status_email_jobs_spec.rb b/spec/jobs/ingest_batch_status_email_jobs_spec.rb
index b05391558a..9b3e250130 100644
--- a/spec/jobs/ingest_batch_status_email_jobs_spec.rb
+++ b/spec/jobs/ingest_batch_status_email_jobs_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/master_file_management_jobs_spec.rb b/spec/jobs/master_file_management_jobs_spec.rb
index 876e5a18b0..f8b2ad0b45 100644
--- a/spec/jobs/master_file_management_jobs_spec.rb
+++ b/spec/jobs/master_file_management_jobs_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -32,7 +32,7 @@
     describe "delete_masterfile" do
       it "should delete masterfile" do
         MasterFileManagementJobs::Delete.perform_now(master_file.id)
-        expect(File.exists? location).to be false
+        expect(File.exist? location).to be false
         expect(MasterFile.find(master_file.id).file_location).to be_blank
       end
     end
@@ -41,16 +41,16 @@
       it "should move masterfile" do
         newpath = "/path/to/new/file.mp4"
         MasterFileManagementJobs::Move.perform_now(master_file.id, newpath)
-        expect(File.exists? location).to be false
-        expect(File.exists? newpath).to be true
+        expect(File.exist? location).to be false
+        expect(File.exist? newpath).to be true
         expect(newpath).to eq MasterFile.find(master_file.id).file_location
       end
 
       it 'does nothing if masterfile already moved' do
         newpath = master_file.file_location
         MasterFileManagementJobs::Move.perform_now(master_file.id, newpath)
-        expect(File.exists? location).to be true
-        expect(File.exists? newpath).to be true
+        expect(File.exist? location).to be true
+        expect(File.exist? newpath).to be true
         expect(newpath).to eq MasterFile.find(master_file.id).file_location
       end
     end
@@ -60,8 +60,8 @@
       it "should move masterfile with space in filename" do
         newpath = "/path/to/new/file with space.mp4"
         MasterFileManagementJobs::Move.perform_now(master_file.id, newpath)
-        expect(File.exists? location).to be false
-        expect(File.exists? newpath).to be true
+        expect(File.exist? location).to be false
+        expect(File.exist? newpath).to be true
         expect(newpath).to eq MasterFile.find(master_file.id).file_location
       end
     end
diff --git a/spec/jobs/media_object_indexing_job_spec.rb b/spec/jobs/media_object_indexing_job_spec.rb
new file mode 100644
index 0000000000..f621d23698
--- /dev/null
+++ b/spec/jobs/media_object_indexing_job_spec.rb
@@ -0,0 +1,32 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
+require 'rails_helper'
+
+describe MediaObjectIndexingJob do
+  let(:job) { MediaObjectIndexingJob.new }
+
+  describe "perform" do
+    let!(:media_object) { FactoryBot.create(:media_object) }
+    let!(:master_file) { FactoryBot.create(:master_file, media_object: media_object) }
+
+    it 'indexes the media object including master_file fields' do
+      before_doc = ActiveFedora::SolrService.query("id:#{media_object.id}").first
+      expect(before_doc["section_id_ssim"]).to be_blank
+      job.perform(media_object.id)
+      after_doc = ActiveFedora::SolrService.query("id:#{media_object.id}").first
+      expect(after_doc["section_id_ssim"]).to eq [master_file.id]
+    end
+  end
+end
diff --git a/spec/jobs/reindex_job_spec.rb b/spec/jobs/reindex_job_spec.rb
index 3f61a9e535..77e64a4943 100644
--- a/spec/jobs/reindex_job_spec.rb
+++ b/spec/jobs/reindex_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/update_dependent_permalinks_job_spec.rb b/spec/jobs/update_dependent_permalinks_job_spec.rb
index ed5097e896..c9a0cdb7ec 100644
--- a/spec/jobs/update_dependent_permalinks_job_spec.rb
+++ b/spec/jobs/update_dependent_permalinks_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/jobs/waveform_job_spec.rb b/spec/jobs/waveform_job_spec.rb
index 533eb4bad2..59dd023f53 100644
--- a/spec/jobs/waveform_job_spec.rb
+++ b/spec/jobs/waveform_job_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/batch/entry_spec.rb b/spec/lib/avalon/batch/entry_spec.rb
index c8214c6a55..cdb15dc242 100644
--- a/spec/lib/avalon/batch/entry_spec.rb
+++ b/spec/lib/avalon/batch/entry_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/batch/package_spec.rb b/spec/lib/avalon/batch/package_spec.rb
index 88d688bdd4..10df8ad757 100644
--- a/spec/lib/avalon/batch/package_spec.rb
+++ b/spec/lib/avalon/batch/package_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/batch_ingest_spec.rb b/spec/lib/avalon/batch_ingest_spec.rb
index 13d683f7ad..ea187f3659 100644
--- a/spec/lib/avalon/batch_ingest_spec.rb
+++ b/spec/lib/avalon/batch_ingest_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -112,7 +112,7 @@
       expect { batch_ingest.scan_for_packages }.not_to raise_error
       expect { batch_ingest.scan_for_packages }.not_to change{BatchRegistries.count}
       error_file = File.join(@dropbox_dir,'example_batch_ingest','bad_manifest.xlsx.error')
-      expect(File.exists?(error_file)).to be true
+      expect(File.exist?(error_file)).to be true
       expect(File.read(error_file)).to match(/^Invalid manifest/)
     end
 
diff --git a/spec/lib/avalon/bib_retriever_spec.rb b/spec/lib/avalon/bib_retriever_spec.rb
index 7c08e1e5a6..75ff56e01c 100644
--- a/spec/lib/avalon/bib_retriever_spec.rb
+++ b/spec/lib/avalon/bib_retriever_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/build_utils_spec.rb b/spec/lib/avalon/build_utils_spec.rb
index 3268dbd2b6..d236dfebeb 100644
--- a/spec/lib/avalon/build_utils_spec.rb
+++ b/spec/lib/avalon/build_utils_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/controlled_vocabulary_spec.rb b/spec/lib/avalon/controlled_vocabulary_spec.rb
index bc6f2d7a6d..eb667bb63c 100644
--- a/spec/lib/avalon/controlled_vocabulary_spec.rb
+++ b/spec/lib/avalon/controlled_vocabulary_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/dropbox_spec.rb b/spec/lib/avalon/dropbox_spec.rb
index 313359344f..4940051fd5 100644
--- a/spec/lib/avalon/dropbox_spec.rb
+++ b/spec/lib/avalon/dropbox_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/elastic_transcoder_encode_spec.rb b/spec/lib/avalon/elastic_transcoder_encode_spec.rb
index 05538c50e6..d6aad03ee3 100644
--- a/spec/lib/avalon/elastic_transcoder_encode_spec.rb
+++ b/spec/lib/avalon/elastic_transcoder_encode_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/elastic_transcoder_spec.rb b/spec/lib/avalon/elastic_transcoder_spec.rb
index 980240eb2b..1ac22efa6a 100644
--- a/spec/lib/avalon/elastic_transcoder_spec.rb
+++ b/spec/lib/avalon/elastic_transcoder_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/file_resolver_spec.rb b/spec/lib/avalon/file_resolver_spec.rb
index 36e5c5dec2..badeea6d56 100644
--- a/spec/lib/avalon/file_resolver_spec.rb
+++ b/spec/lib/avalon/file_resolver_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/intercom_spec.rb b/spec/lib/avalon/intercom_spec.rb
index 41ab095f51..8206114a1b 100644
--- a/spec/lib/avalon/intercom_spec.rb
+++ b/spec/lib/avalon/intercom_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/m3u8_read_spec.rb b/spec/lib/avalon/m3u8_read_spec.rb
index adf4e7dda0..562749e9bd 100644
--- a/spec/lib/avalon/m3u8_read_spec.rb
+++ b/spec/lib/avalon/m3u8_read_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/avalon/sanitizer_spec.rb b/spec/lib/avalon/sanitizer_spec.rb
index 04faf530a4..0b030a524e 100644
--- a/spec/lib/avalon/sanitizer_spec.rb
+++ b/spec/lib/avalon/sanitizer_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/lib/day_hour_string_spec.rb b/spec/lib/day_hour_string_spec.rb
index fb2ed7c7d2..faf743dd59 100644
--- a/spec/lib/day_hour_string_spec.rb
+++ b/spec/lib/day_hour_string_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/lib/string_additions_spec.rb b/spec/lib/string_additions_spec.rb
index d975164457..2e182b93f2 100644
--- a/spec/lib/string_additions_spec.rb
+++ b/spec/lib/string_additions_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/mailers/batch_registries_mailer_spec.rb b/spec/mailers/batch_registries_mailer_spec.rb
index 288977003b..79982d8677 100644
--- a/spec/mailers/batch_registries_mailer_spec.rb
+++ b/spec/mailers/batch_registries_mailer_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/mailers/comments_mailer_spec.rb b/spec/mailers/comments_mailer_spec.rb
index 3540364ffa..3aaf9fef80 100644
--- a/spec/mailers/comments_mailer_spec.rb
+++ b/spec/mailers/comments_mailer_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/mailers/ingest_batch_mailer_spec.rb b/spec/mailers/ingest_batch_mailer_spec.rb
index 0021524e51..8024079693 100644
--- a/spec/mailers/ingest_batch_mailer_spec.rb
+++ b/spec/mailers/ingest_batch_mailer_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/mailers/notifications_mailer_spec.rb b/spec/mailers/notifications_mailer_spec.rb
index 0035f3c905..652c0c37a4 100644
--- a/spec/mailers/notifications_mailer_spec.rb
+++ b/spec/mailers/notifications_mailer_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/mailers/previews/comments_mailer_preview.rb b/spec/mailers/previews/comments_mailer_preview.rb
index 6295d4f42d..8a630ba41c 100644
--- a/spec/mailers/previews/comments_mailer_preview.rb
+++ b/spec/mailers/previews/comments_mailer_preview.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 class CommentsMailerPreview < ActionMailer::Preview
   def contact_email
     @comment = Comment.new
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index fc06ff57c6..c50a826161 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/avalon_annotation_spec.rb b/spec/models/avalon_annotation_spec.rb
index 48d33e5674..e83c4ac5e0 100644
--- a/spec/models/avalon_annotation_spec.rb
+++ b/spec/models/avalon_annotation_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/avalon_clip_spec.rb b/spec/models/avalon_clip_spec.rb
index 842c249c73..8f59e5d024 100644
--- a/spec/models/avalon_clip_spec.rb
+++ b/spec/models/avalon_clip_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/avalon_marker_spec.rb b/spec/models/avalon_marker_spec.rb
index cbdf60c625..403ddde788 100644
--- a/spec/models/avalon_marker_spec.rb
+++ b/spec/models/avalon_marker_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/batch_entries_spec.rb b/spec/models/batch_entries_spec.rb
index 4c3968cbe7..c875fd0da4 100644
--- a/spec/models/batch_entries_spec.rb
+++ b/spec/models/batch_entries_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/batch_registries_spec.rb b/spec/models/batch_registries_spec.rb
index 1ae9c9a585..3891c1e36e 100644
--- a/spec/models/batch_registries_spec.rb
+++ b/spec/models/batch_registries_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/checkout_spec.rb b/spec/models/checkout_spec.rb
index 01e0a7b07b..77c4d16928 100644
--- a/spec/models/checkout_spec.rb
+++ b/spec/models/checkout_spec.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 require 'rails_helper'
 require 'cancan/matchers'
 
diff --git a/spec/models/collection_spec.rb b/spec/models/collection_spec.rb
index f6fd682b27..fa07c23c24 100644
--- a/spec/models/collection_spec.rb
+++ b/spec/models/collection_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb
index 7a0081cf32..f9b72bac95 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comments_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/concerns/hidden_spec.rb b/spec/models/concerns/hidden_spec.rb
index 9baae743b4..a57b27a035 100644
--- a/spec/models/concerns/hidden_spec.rb
+++ b/spec/models/concerns/hidden_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/concerns/migration_target_spec.rb b/spec/models/concerns/migration_target_spec.rb
index 2b519e1771..311a76bedb 100644
--- a/spec/models/concerns/migration_target_spec.rb
+++ b/spec/models/concerns/migration_target_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/concerns/permalink_spec.rb b/spec/models/concerns/permalink_spec.rb
index 6fdc55e68b..9359f8ed92 100644
--- a/spec/models/concerns/permalink_spec.rb
+++ b/spec/models/concerns/permalink_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/concerns/virtual_groups_spec.rb b/spec/models/concerns/virtual_groups_spec.rb
index bd221df58c..f6a101878c 100644
--- a/spec/models/concerns/virtual_groups_spec.rb
+++ b/spec/models/concerns/virtual_groups_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/course_spec.rb b/spec/models/course_spec.rb
index 2c5f520fe8..240a3f2b30 100644
--- a/spec/models/course_spec.rb
+++ b/spec/models/course_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/derivative_spec.rb b/spec/models/derivative_spec.rb
index db384bd0a1..1664565070 100644
--- a/spec/models/derivative_spec.rb
+++ b/spec/models/derivative_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/external_group_spec.rb b/spec/models/external_group_spec.rb
index 4d3ba56b2b..76cdbeb374 100644
--- a/spec/models/external_group_spec.rb
+++ b/spec/models/external_group_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/ffmpeg_encode_spec.rb b/spec/models/ffmpeg_encode_spec.rb
index 774414ce2c..106220694c 100644
--- a/spec/models/ffmpeg_encode_spec.rb
+++ b/spec/models/ffmpeg_encode_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/file_upload_step_spec.rb b/spec/models/file_upload_step_spec.rb
index 1650daa01a..b18112858b 100644
--- a/spec/models/file_upload_step_spec.rb
+++ b/spec/models/file_upload_step_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 9c26ca32c6..96730f59c3 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/iiif_canvas_presenter_spec.rb b/spec/models/iiif_canvas_presenter_spec.rb
index b84452338d..f12563be45 100644
--- a/spec/models/iiif_canvas_presenter_spec.rb
+++ b/spec/models/iiif_canvas_presenter_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -56,4 +56,36 @@
       end
     end
   end
+
+  describe '#range' do
+    let(:structure_xml) { '<?xml version="1.0"?><Item label="Test"><Div label="Div 1"><Span label="Span 1" begin="00:00:00.000" end="00:00:01.235"/></Div></Item>' }
+
+    subject { presenter.range }
+
+    before do
+      master_file.structuralMetadata.content = structure_xml
+    end
+
+    it 'converts stored xml into IIIF ranges' do
+      expect(subject.label.to_s).to eq '{"none"=>["Test"]}'
+      expect(subject.items.size).to eq 1
+      expect(subject.items.first.label.to_s).to eq '{"none"=>["Div 1"]}'
+      expect(subject.items.first.items.size).to eq 1
+      expect(subject.items.first.items.first.label.to_s).to eq '{"none"=>["Span 1"]}'
+      expect(subject.items.first.items.first.items.size).to eq 1
+      expect(subject.items.first.items.first.items.first).to be_a IiifCanvasPresenter
+      expect(subject.items.first.items.first.items.first.media_fragment).to eq 't=0.0,1.235'
+    end
+
+    context 'with no structural metadata' do
+      let(:structure_xml) { "" }
+
+      it 'autogenerates a basic range' do
+	expect(subject.label.to_s).to eq "{\"none\"=>[\"#{master_file.embed_title}\"]}"
+	expect(subject.items.size).to eq 1
+	expect(subject.items.first).to be_a IiifCanvasPresenter
+        expect(subject.items.first.media_fragment).to eq 't=0,'
+      end
+    end
+  end
 end
diff --git a/spec/models/iiif_manifest_presenter_spec.rb b/spec/models/iiif_manifest_presenter_spec.rb
index c89e502fef..cdced8a966 100644
--- a/spec/models/iiif_manifest_presenter_spec.rb
+++ b/spec/models/iiif_manifest_presenter_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/ingest_batch_spec.rb b/spec/models/ingest_batch_spec.rb
index 5580b1b980..be1db31b21 100644
--- a/spec/models/ingest_batch_spec.rb
+++ b/spec/models/ingest_batch_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/lease_spec.rb b/spec/models/lease_spec.rb
index 8e3dd22a96..b0f1f4f3f5 100644
--- a/spec/models/lease_spec.rb
+++ b/spec/models/lease_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/master_file_spec.rb b/spec/models/master_file_spec.rb
index 611f832bb4..fd9b236467 100644
--- a/spec/models/master_file_spec.rb
+++ b/spec/models/master_file_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -624,7 +624,7 @@
         let(:high_derivative_locator) { FileLocator.new(video_master_file.derivatives.where(quality_ssi: 'high').first.absolute_location) }
 
         it 'uses high derivative' do
-          expect(File).to receive(:exists?).with(high_derivative_locator.location).and_return(true)
+          expect(File).to receive(:exist?).with(high_derivative_locator.location).and_return(true)
           expect(source[:source]).to eq high_derivative_locator.location
           expect(source[:non_temp_file]).to eq true
         end
@@ -636,7 +636,7 @@
 
         it 'falls back to HLS' do
           expect(video_master_file).to receive(:create_frame_source_hls_temp_file).and_return(hls_temp_file)
-          expect(File).to receive(:exists?).with(high_derivative_locator.location).and_return(false)
+          expect(File).to receive(:exist?).with(high_derivative_locator.location).and_return(false)
           expect(source[:source]).to eq '/tmp/temp_segment.ts'
           expect(source[:non_temp_file]).to eq false
         end
@@ -836,4 +836,19 @@
       end
     end
   end
+
+  describe 'indexing' do
+    let(:master_file) { FactoryBot.build(:master_file, :with_media_object) }
+
+    before do
+      # Force creation of master_file and then clear queue of byproduct jobs
+      master_file
+      ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+    end
+
+    it 'enqueues indexing of parent media object' do
+      master_file.update_index
+      expect(MediaObjectIndexingJob).to have_been_enqueued.with(master_file.media_object.id)
+    end
+  end
 end
diff --git a/spec/models/media_object_spec.rb b/spec/models/media_object_spec.rb
index 0dbc52cb0b..238b1b32b5 100644
--- a/spec/models/media_object_spec.rb
+++ b/spec/models/media_object_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -455,22 +455,39 @@
   end
 
   describe '#calculate_duration' do
-    it 'returns zero if there are zero master files' do
-      expect(media_object.send(:calculate_duration)).to eq(0)
+    let(:master_file1) { FactoryBot.create(:master_file, media_object: media_object, duration: '40') }
+    let(:master_file2) { FactoryBot.create(:master_file, media_object: media_object, duration: '40') }
+    let(:master_file3) { FactoryBot.create(:master_file, media_object: media_object, duration: nil) }
+    let(:master_files) { [] }
+
+    before do
+      master_files
+      # Explicitly run indexing job to ensure fields are indexed for structure searching
+      MediaObjectIndexingJob.perform_now(media_object.id)
+    end
+
+    context 'with zero master files' do
+      it 'returns zero' do
+	expect(media_object.send(:calculate_duration)).to eq(0)
+      end
     end
-    it 'returns the correct duration with two master files' do
-      media_object.ordered_master_files += [FactoryBot.create(:master_file, duration: '40')]
-      media_object.ordered_master_files += [FactoryBot.create(:master_file, duration: '40')]
-      expect(media_object.send(:calculate_duration)).to eq(80)
+    context 'with two master files' do
+      let(:master_files) { [master_file1, master_file2] }
+      it 'returns the correct duration' do
+	expect(media_object.send(:calculate_duration)).to eq(80)
+      end
     end
-    it 'returns the correct duration with two master files one nil' do
-      media_object.ordered_master_files += [FactoryBot.create(:master_file, duration: '40')]
-      media_object.ordered_master_files += [FactoryBot.create(:master_file, duration:nil)]
-      expect(media_object.send(:calculate_duration)).to eq(40)
+    context 'with two master files one nil' do
+      let(:master_files) { [master_file1, master_file3] }
+      it 'returns the correct duration' do
+	expect(media_object.send(:calculate_duration)).to eq(40)
+      end
     end
-    it 'returns the correct duration with one master file that is nil' do
-      media_object.ordered_master_files += [FactoryBot.create(:master_file, duration:nil)]
-      expect(media_object.send(:calculate_duration)).to eq(0)
+    context 'with one master file that is nil' do
+      let(:master_files) { [master_file3] }
+      it 'returns the correct duration' do
+	expect(media_object.send(:calculate_duration)).to eq(0)
+      end
     end
   end
 
@@ -561,13 +578,13 @@
     it 'should index identifier for master files' do
       master_file = FactoryBot.create(:master_file, identifier: ['TestOtherID'], media_object: media_object)
       media_object.reload
-      solr_doc = media_object.to_solr
+      solr_doc = media_object.to_solr(include_child_fields: true)
       expect(solr_doc['other_identifier_sim']).to include('TestOtherID')
     end
     it 'should index labels for master files' do
       FactoryBot.create(:master_file, :with_structure, media_object: media_object, title: 'Test Label')
       media_object.reload
-      solr_doc = media_object.to_solr
+      solr_doc = media_object.to_solr(include_child_fields: true)
       expect(solr_doc['section_label_tesim']).to include('CD 1')
       expect(solr_doc['section_label_tesim']).to include('Test Label')
     end
@@ -576,7 +593,7 @@
       media_object.comment = ['MO Comment']
       media_object.save!
       media_object.reload
-      solr_doc = media_object.to_solr
+      solr_doc = media_object.to_solr(include_child_fields: true)
       expect(solr_doc['all_comments_sim']).to include('MO Comment')
       expect(solr_doc['all_comments_sim']).to include('[Test Label] MF Comment 1')
       expect(solr_doc['all_comments_sim']).to include('[Test Label] MF Comment 2')
@@ -1045,4 +1062,34 @@
       end
     end
   end
+
+  describe 'read_groups=' do
+    let(:solr_doc) { ActiveFedora::SolrService.query("id:#{media_object.id}").first }
+
+    context 'when creating a MediaObject' do
+      let(:media_object) { FactoryBot.build(:media_object) }
+
+      it 'saves and indexes' do
+        expect(media_object.read_groups).to be_empty
+        media_object.read_groups = ["ExternalGroup"]
+        expect(media_object.access_control).to be_changed
+        media_object.save
+        expect(media_object.reload.read_groups).to eq ["ExternalGroup"]
+        expect(solr_doc["read_access_group_ssim"]).to eq ["ExternalGroup"]
+      end
+    end
+
+    context 'when updating a MediaObject' do
+      let(:media_object) { FactoryBot.create(:media_object) }
+
+      it 'saves and indexes' do
+        expect(media_object.read_groups).to be_empty
+        media_object.read_groups = ["ExternalGroup"]
+        expect(media_object.access_control).to be_changed
+        media_object.save
+        expect(media_object.reload.read_groups).to eq ["ExternalGroup"]
+        expect(solr_doc["read_access_group_ssim"]).to eq ["ExternalGroup"]
+      end
+    end
+  end
 end
diff --git a/spec/models/pass_through_encode_spec.rb b/spec/models/pass_through_encode_spec.rb
index 512455eeab..d66cd226e6 100644
--- a/spec/models/pass_through_encode_spec.rb
+++ b/spec/models/pass_through_encode_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/playlist_item_spec.rb b/spec/models/playlist_item_spec.rb
index 80789c735f..cc9d3f51f5 100644
--- a/spec/models/playlist_item_spec.rb
+++ b/spec/models/playlist_item_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/playlist_spec.rb b/spec/models/playlist_spec.rb
index a392612e44..edce5c91dd 100644
--- a/spec/models/playlist_spec.rb
+++ b/spec/models/playlist_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/role_map_spec.rb b/spec/models/role_map_spec.rb
index 21cb2cb42e..d919a56757 100644
--- a/spec/models/role_map_spec.rb
+++ b/spec/models/role_map_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/search_builder_spec.rb b/spec/models/search_builder_spec.rb
index db4c9ed5eb..0faa2ffba5 100644
--- a/spec/models/search_builder_spec.rb
+++ b/spec/models/search_builder_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/security_handler_spec.rb b/spec/models/security_handler_spec.rb
index 1bea0221ad..d556f84a29 100644
--- a/spec/models/security_handler_spec.rb
+++ b/spec/models/security_handler_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/stream_token_spec.rb b/spec/models/stream_token_spec.rb
index 0a148aa4ee..e576c6c9fb 100644
--- a/spec/models/stream_token_spec.rb
+++ b/spec/models/stream_token_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/supplemental_file_spec.rb b/spec/models/supplemental_file_spec.rb
index d4f633c61a..e2683f2e62 100644
--- a/spec/models/supplemental_file_spec.rb
+++ b/spec/models/supplemental_file_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/timeline_spec.rb b/spec/models/timeline_spec.rb
index fdfe284387..2d8b0f7591 100644
--- a/spec/models/timeline_spec.rb
+++ b/spec/models/timeline_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a7f68d6b76..a89677bf6a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/models/watched_encode_spec.rb b/spec/models/watched_encode_spec.rb
index 011ac61bc2..e940af9eb1 100644
--- a/spec/models/watched_encode_spec.rb
+++ b/spec/models/watched_encode_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/models/working_file_path_spec.rb b/spec/models/working_file_path_spec.rb
index 2303235d8c..096dc32862 100644
--- a/spec/models/working_file_path_spec.rb
+++ b/spec/models/working_file_path_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -94,7 +94,7 @@
       it 'sends the working_file_path to active_encode' do
         MasterFileBuilder.build(media_object, params)
         master_file = media_object.reload.master_files.first
-        expect(File.exists? master_file.working_file_path.first).to be true
+        expect(File.exist? master_file.working_file_path.first).to be true
         input = FileLocator.new(master_file.working_file_path.first).uri.to_s
         expect(encoder_class).to have_received(:create).with(input, { headers: nil, master_file_id: master_file.id, preset: workflow })
       end
@@ -105,7 +105,7 @@
         it 'sends the working_file_path to active_encode' do
           MasterFileBuilder.build(media_object, params)
           master_file = media_object.reload.master_files.first
-          expect(File.exists? master_file.working_file_path.first).to be true
+          expect(File.exist? master_file.working_file_path.first).to be true
           input_path = FileLocator.new(master_file.working_file_path.first).uri.to_s
           expect(encoder_class).to have_received(:create).with(input_path, master_file_id: master_file.id, outputs: [{ label: "high", url: input_path }], preset: "pass_through")
         end
@@ -120,7 +120,7 @@
       it 'sends the working_file_path to active_encode' do
         MasterFileBuilder.build(media_object, params)
         master_file = media_object.reload.master_files.first
-        expect(File.exists? master_file.working_file_path.first).to be true
+        expect(File.exist? master_file.working_file_path.first).to be true
         input = FileLocator.new(master_file.working_file_path.first).uri.to_s
         expect(encoder_class).to have_received(:create).with(input, { headers: nil, master_file_id: master_file.id, preset: workflow })
       end
@@ -131,7 +131,7 @@
         it 'sends the working_file_path to active_encode' do
           MasterFileBuilder.build(media_object, params)
           master_file = media_object.reload.master_files.first
-          expect(File.exists? master_file.working_file_path.first).to be true
+          expect(File.exist? master_file.working_file_path.first).to be true
           input_path = FileLocator.new(master_file.working_file_path.first).uri.to_s
           expect(encoder_class).to have_received(:create).with(input_path, master_file_id: master_file.id, outputs: [{ label: "high", url: input_path }], preset: "pass_through")
         end
@@ -153,7 +153,7 @@
       it 'sends the working_file_path to active_encode' do
         entry.process!
         master_file = media_object.reload.master_files.first
-        expect(File.exists? master_file.working_file_path.first).to be true
+        expect(File.exist? master_file.working_file_path.first).to be true
         input = FileLocator.new(master_file.working_file_path.first).uri.to_s
         expect(encoder_class).to have_received(:create).with(input, { headers: nil, master_file_id: master_file.id, preset: workflow })
       end
@@ -164,7 +164,7 @@
         it 'sends the working_file_path to active_encode' do
           entry.process!
           master_file = media_object.reload.master_files.first
-          expect(File.exists? master_file.working_file_path.first).to be true
+          expect(File.exist? master_file.working_file_path.first).to be true
           input_path = FileLocator.new(master_file.working_file_path.first).uri.to_s
           expect(encoder_class).to have_received(:create).with(input_path, master_file_id: master_file.id, outputs: [{ label: "high", url: input_path }], preset: "pass_through" )
         end
@@ -197,7 +197,7 @@
           working_file_path_low = master_file.working_file_path.find { |file| file.include? "low" }
 
           [working_file_path_high, working_file_path_medium, working_file_path_low].each do |file|
-            expect(File.exists? file).to be true
+            expect(File.exist? file).to be true
           end
 
           input_path = FileLocator.new(working_file_path_high).uri.to_s
diff --git a/spec/presenters/admin_collection_presenter_spec.rb b/spec/presenters/admin_collection_presenter_spec.rb
index 7108b921fd..ff3cdf60cf 100644
--- a/spec/presenters/admin_collection_presenter_spec.rb
+++ b/spec/presenters/admin_collection_presenter_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/presenters/collection_presenter_spec.rb b/spec/presenters/collection_presenter_spec.rb
index 260b751173..37e7902c11 100644
--- a/spec/presenters/collection_presenter_spec.rb
+++ b/spec/presenters/collection_presenter_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/presenters/speedy_af/proxy/derivative_spec.rb b/spec/presenters/speedy_af/proxy/derivative_spec.rb
new file mode 100644
index 0000000000..2c7d049530
--- /dev/null
+++ b/spec/presenters/speedy_af/proxy/derivative_spec.rb
@@ -0,0 +1,43 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
+require 'rails_helper'
+
+describe SpeedyAF::Proxy::Derivative do
+  let(:derivative) { FactoryBot.create(:derivative) }
+  before(:each) do
+    derivative.video_codec = nil
+    derivative.video_bitrate = nil
+    derivative.mime_type = nil
+    derivative.save
+  end
+  subject(:presenter) { described_class.find(derivative.id) }
+
+  describe "#defaults" do
+    it "sets video_bitrate to nil" do
+      expect(subject.inspect).to include("video_bitrate")
+      expect(subject.video_bitrate).to be_nil
+    end
+
+    it "sets video_codec to nil" do
+      expect(subject.inspect).to include("video_codec")
+      expect(subject.video_codec).to be_nil
+    end
+
+    it "sets mime_type to nil" do
+      expect(subject.inspect).to include("mime_type")
+      expect(subject.mime_type).to be_nil
+    end
+  end
+end
diff --git a/spec/presenters/speedy_af/proxy/master_file_spec.rb b/spec/presenters/speedy_af/proxy/master_file_spec.rb
index ee7a7c819a..b02a932cf4 100644
--- a/spec/presenters/speedy_af/proxy/master_file_spec.rb
+++ b/spec/presenters/speedy_af/proxy/master_file_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 73f8c4048f..9fbe4a1989 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -105,7 +105,7 @@
   include Noid::Rails::RSpec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.file_fixture_path = "#{::Rails.root}/spec/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -195,5 +195,6 @@
 end
 
 FactoryBot::SyntaxRunner.class_eval do
-  include ActionDispatch::TestProcess
+  include ActiveSupport::Testing::FileFixtures
+  include ActionDispatch::TestProcess::FixtureFile
 end
diff --git a/spec/requests/about_page_spec.rb b/spec/requests/about_page_spec.rb
index 27a1d75309..20049ae5df 100644
--- a/spec/requests/about_page_spec.rb
+++ b/spec/requests/about_page_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/requests/api_authentication_spec.rb b/spec/requests/api_authentication_spec.rb
index e50792b131..7751a96ee3 100644
--- a/spec/requests/api_authentication_spec.rb
+++ b/spec/requests/api_authentication_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/requests/atom_feed_spec.rb b/spec/requests/atom_feed_spec.rb
index 2275190417..cf86f4c302 100644
--- a/spec/requests/atom_feed_spec.rb
+++ b/spec/requests/atom_feed_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/requests/checkouts_spec.rb b/spec/requests/checkouts_spec.rb
index 4eb89ba690..788253d046 100644
--- a/spec/requests/checkouts_spec.rb
+++ b/spec/requests/checkouts_spec.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
diff --git a/spec/requests/comments_spec.rb b/spec/requests/comments_spec.rb
index ab3f1299e9..35f1383209 100644
--- a/spec/requests/comments_spec.rb
+++ b/spec/requests/comments_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/requests/cors_spec.rb b/spec/requests/cors_spec.rb
index c662c88d5a..515b9742bf 100644
--- a/spec/requests/cors_spec.rb
+++ b/spec/requests/cors_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/requests/devise_login.rb b/spec/requests/devise_login.rb
index 224e6add84..721e77ec52 100644
--- a/spec/requests/devise_login.rb
+++ b/spec/requests/devise_login.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/requests/jobs_spec.rb b/spec/requests/jobs_spec.rb
index b61947aa9a..74937e752a 100644
--- a/spec/requests/jobs_spec.rb
+++ b/spec/requests/jobs_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/requests/mejs_spec.rb b/spec/requests/mejs_spec.rb
index df570c73f8..cb365c1b2a 100644
--- a/spec/requests/mejs_spec.rb
+++ b/spec/requests/mejs_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/requests/redirect_spec.rb b/spec/requests/redirect_spec.rb
index e2438e3f24..6981ec296a 100644
--- a/spec/requests/redirect_spec.rb
+++ b/spec/requests/redirect_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/routing/admin_collections_controller_routing_spec.rb b/spec/routing/admin_collections_controller_routing_spec.rb
index 534d7f2c0b..92403bbdcf 100644
--- a/spec/routing/admin_collections_controller_routing_spec.rb
+++ b/spec/routing/admin_collections_controller_routing_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/routing/checkouts_routing_spec.rb b/spec/routing/checkouts_routing_spec.rb
index 1ae50ab465..5df6db7a51 100644
--- a/spec/routing/checkouts_routing_spec.rb
+++ b/spec/routing/checkouts_routing_spec.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 require "rails_helper"
 
 RSpec.describe CheckoutsController, type: :routing do
diff --git a/spec/routing/collections_routing_spec.rb b/spec/routing/collections_routing_spec.rb
index 7eba0f2333..2bc5115c88 100644
--- a/spec/routing/collections_routing_spec.rb
+++ b/spec/routing/collections_routing_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/routing/master_files_routing_spec.rb b/spec/routing/master_files_routing_spec.rb
index 2f7ca7446e..8d6baf84b7 100644
--- a/spec/routing/master_files_routing_spec.rb
+++ b/spec/routing/master_files_routing_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -19,5 +19,8 @@
     it "routes to #move" do
       expect(:post => "/master_files/abc1234/move").to route_to("master_files#move", id: 'abc1234')
     end
+    it "routes to #caption_manifest" do
+      expect(:get => "/master_files/abc1234/caption_manifest").to route_to("master_files#caption_manifest", id: 'abc1234')
+    end
   end
 end
diff --git a/spec/routing/media_objects_routing_spec.rb b/spec/routing/media_objects_routing_spec.rb
index 22534b46db..82a7bd3992 100644
--- a/spec/routing/media_objects_routing_spec.rb
+++ b/spec/routing/media_objects_routing_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/routing/supplemental_files_routing_spec.rb b/spec/routing/supplemental_files_routing_spec.rb
index 838562f0f8..b3390daebf 100644
--- a/spec/routing/supplemental_files_routing_spec.rb
+++ b/spec/routing/supplemental_files_routing_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/routing/timelines_routing_spec.rb b/spec/routing/timelines_routing_spec.rb
index 28adf2d8c6..c07db92b27 100644
--- a/spec/routing/timelines_routing_spec.rb
+++ b/spec/routing/timelines_routing_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/services/file_locator_spec.rb b/spec/services/file_locator_spec.rb
index d51ad90e18..f8255a0e40 100644
--- a/spec/services/file_locator_spec.rb
+++ b/spec/services/file_locator_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/services/master_file_builder_spec.rb b/spec/services/master_file_builder_spec.rb
index 11aca5a7d3..b4421dea7f 100644
--- a/spec/services/master_file_builder_spec.rb
+++ b/spec/services/master_file_builder_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/services/security_service_spec.rb b/spec/services/security_service_spec.rb
index e73a83729c..2cea3f08b1 100644
--- a/spec/services/security_service_spec.rb
+++ b/spec/services/security_service_spec.rb
@@ -1,11 +1,11 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-#
+# 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 #   CONDITIONS OF ANY KIND, either express or implied. See the License for the
diff --git a/spec/services/solr_collection_admin_spec.rb b/spec/services/solr_collection_admin_spec.rb
index 1ded367759..b448233c06 100644
--- a/spec/services/solr_collection_admin_spec.rb
+++ b/spec/services/solr_collection_admin_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/services/solr_collection_creator_spec.rb b/spec/services/solr_collection_creator_spec.rb
index 4b994bfb4c..2a01311248 100644
--- a/spec/services/solr_collection_creator_spec.rb
+++ b/spec/services/solr_collection_creator_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/services/waveform_service_spec.rb b/spec/services/waveform_service_spec.rb
index 20e867eae1..4c60308dc4 100644
--- a/spec/services/waveform_service_spec.rb
+++ b/spec/services/waveform_service_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
@@ -31,7 +31,7 @@
     context "s3 file" do
       let(:uri) { Addressable::URI.parse("s3://path/to/video.mp4") }
       let(:tmpfile) { Tempfile.new }
-      
+
       before do
         allow(Tempfile).to receive(:new).and_return tmpfile
       end
@@ -67,7 +67,7 @@
 
     context "http file" do
       let(:uri) { "http://domain/to/video.mp4" }
-      let(:cmd) {"#{Settings.ffmpeg.path} -headers $'Referer: http://test.host/\r\n' -i '#{uri}' -f wav -ar 44100 - 2> /dev/null"}
+      let(:cmd) {"#{Settings.ffmpeg.path} -headers $'Referer: http://test.host/\r\n' -rw_timeout 3600000000 -i '#{uri}' -f wav -ar 44100 - 2> /dev/null"}
 
       it "should call ffmpeg with headers" do
         service.send(:get_wave_io, uri)
@@ -77,7 +77,7 @@
 
     context "local file" do
       let(:uri) { "file:///path/to/video.mp4" }
-      let(:cmd) {"#{Settings.ffmpeg.path}  -i '#{uri}' -f wav -ar 44100 - 2> /dev/null"}
+      let(:cmd) {"#{Settings.ffmpeg.path}  -rw_timeout 3600000000 -i '#{uri}' -f wav -ar 44100 - 2> /dev/null"}
 
       it "should call ffmpeg without headers" do
         service.send(:get_wave_io, uri)
@@ -87,7 +87,7 @@
       context 'with spaces in filename' do
         let(:uri) { 'file:///path/to/special%20video%20file.mp4' }
         let(:unencoded_uri) { 'file:///path/to/special video file.mp4' }
-        let(:cmd) {"#{Settings.ffmpeg.path}  -i '#{unencoded_uri}' -f wav -ar 44100 - 2> /dev/null"}
+        let(:cmd) {"#{Settings.ffmpeg.path}  -rw_timeout 3600000000 -i '#{unencoded_uri}' -f wav -ar 44100 - 2> /dev/null"}
 
         it "should call ffmpeg without url encoding" do
           service.send(:get_wave_io, uri)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 69c5610a86..00614b6d0c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/controller_macros.rb b/spec/support/controller_macros.rb
index 3a3f4f0534..1e40ac0778 100644
--- a/spec/support/controller_macros.rb
+++ b/spec/support/controller_macros.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/features.rb b/spec/support/features.rb
index 3fc3f9f211..f1c2354d93 100644
--- a/spec/support/features.rb
+++ b/spec/support/features.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 require File.expand_path('../features/session_helpers', __FILE__)
 
 RSpec.configure do |config|
diff --git a/spec/support/features/session_helpers.rb b/spec/support/features/session_helpers.rb
index 4142d2bdf2..b38dbc11f1 100644
--- a/spec/support/features/session_helpers.rb
+++ b/spec/support/features/session_helpers.rb
@@ -6,7 +6,7 @@ def sign_in(who = :user)
       user = who.is_a?(User) ? who : FactoryBot.build(:user).tap(&:save!)
       visit '/users/sign_in'
       within('div.omniauth-form form') do
-        fill_in 'Login', with: user.email
+        fill_in 'Username or email', with: user.email
         fill_in 'Password', with: user.password
         click_on 'Connect'
       end
diff --git a/spec/support/fixture_macros.rb b/spec/support/fixture_macros.rb
index 0283a55afa..09565bb636 100644
--- a/spec/support/fixture_macros.rb
+++ b/spec/support/fixture_macros.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/ldp_call_profile_formatter.rb b/spec/support/ldp_call_profile_formatter.rb
index 7b145e791c..8fd37c3e19 100644
--- a/spec/support/ldp_call_profile_formatter.rb
+++ b/spec/support/ldp_call_profile_formatter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index bab9ba644a..5fda032761 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/optional_example.rb b/spec/support/optional_example.rb
index ac15206d0b..682894f41a 100644
--- a/spec/support/optional_example.rb
+++ b/spec/support/optional_example.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/supplemental_file_shared_examples.rb b/spec/support/supplemental_file_shared_examples.rb
index f591ae80e9..2eda80fb57 100644
--- a/spec/support/supplemental_file_shared_examples.rb
+++ b/spec/support/supplemental_file_shared_examples.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/support/supplemental_files_controller_examples.rb b/spec/support/supplemental_files_controller_examples.rb
index 6e2fb189bd..9118620b6b 100644
--- a/spec/support/supplemental_files_controller_examples.rb
+++ b/spec/support/supplemental_files_controller_examples.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/validators/uniqueness_validator_spec.rb b/spec/validators/uniqueness_validator_spec.rb
index e2102cc7f6..77b6ec56f6 100644
--- a/spec/validators/uniqueness_validator_spec.rb
+++ b/spec/validators/uniqueness_validator_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/spec/views/checkouts/index.html.erb_spec.rb b/spec/views/checkouts/index.html.erb_spec.rb
index c139a5e414..2d2ef1e27b 100644
--- a/spec/views/checkouts/index.html.erb_spec.rb
+++ b/spec/views/checkouts/index.html.erb_spec.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
 require 'rails_helper'
 
 RSpec.describe "checkouts/index", type: :view do
diff --git a/spec/views/google_analytics_spec.rb b/spec/views/google_analytics_spec.rb
index 33e305fdc9..aa52f2f2b4 100644
--- a/spec/views/google_analytics_spec.rb
+++ b/spec/views/google_analytics_spec.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2022, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2023, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 # 
diff --git a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
index 947179759f..2ad33e56fc 100644
--- a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
+++ b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
@@ -1936,7 +1936,17 @@ Object.assign(_player2.default.prototype, {
 			}
 			if (t.forcedHandlePause) {
 				t.slider.focus();
-				t.play();
+				setTimeout(function () {
+					let playPromise = t.play();
+					if(playPromise !== undefined) {
+						playPromise.then(_ => {
+							// Show play UI, and enable controls
+							t.play();
+							t.enableControls();
+						})
+						.catch(error => {	})
+					}
+				}, 150)
 			}
 			t.forcedHandlePause = false;
 		};
diff --git a/yarn.lock b/yarn.lock
index 8e8d2663e9..0e2c6a24cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -894,11 +894,11 @@
     "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
 
 "@babel/runtime@^7.1.2", "@babel/runtime@^7.15.4", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.9.2":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
-  integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
+  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.11"
 
 "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5":
   version "7.16.3"
@@ -1002,6 +1002,11 @@
   resolved "https://registry.yarnpkg.com/@iiif/vocabulary/-/vocabulary-1.0.21.tgz#5808f62da11b64ca42a895025844be088df9f48a"
   integrity sha512-XUD8RYeBiEzv8rdpC9tNBaQ0FMZuGWIkPsmcFhnqXW+5WjZmRLhgqycuoGwIjxt9nPsDgW1IxuiWduNgbLl9UA==
 
+"@iiif/vocabulary@^1.0.26":
+  version "1.0.26"
+  resolved "https://registry.yarnpkg.com/@iiif/vocabulary/-/vocabulary-1.0.26.tgz#557fab623100ca860daeddf6e4de46a8f94aaf86"
+  integrity sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==
+
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -1333,9 +1338,9 @@
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
 "@types/react-redux@^7.1.20":
-  version "7.1.24"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
-  integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
+  version "7.1.25"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.25.tgz#de841631205b24f9dfb4967dd4a7901e048f9a88"
+  integrity sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
@@ -1892,11 +1897,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base-64@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
-  integrity sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==
-
 base64-js@^1.0.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2888,9 +2888,9 @@ csso@^4.0.2:
     css-tree "^1.1.2"
 
 csstype@^2.5.2:
-  version "2.6.20"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda"
-  integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
+  version "2.6.21"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
+  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
 
 csstype@^3.0.2:
   version "3.0.9"
@@ -3034,9 +3034,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^5.2.2:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d"
-  integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
+  integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
@@ -3869,9 +3869,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 hls.js@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.2.1.tgz#09b0207c60fcb3340a88e8d3d1523799fe5fbedf"
-  integrity sha512-+m/5+ikSpmQQvb6FmVWZUZfzvTJMn/QVfiCGP1Oq9WW4RKrAvxlExkhhbcVGgGqLNPFk1kdFkVQur//wKu3JVw==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.3.4.tgz#8212a3f95c3321f64a586f20e67876f3a9d09488"
+  integrity sha512-iFEwVqtEDk6sKotcTwtJ5OMo/nuDTk9PrpB8FI2J2WYf8EriTVfR4FaK0aNyYtwbYeRSWCXJKlz23xeREdlNYg==
 
 "hls.js@https://github.com/avalonmediasystem/hls.js#stricter_ts_probing":
   version "0.13.1"
@@ -4559,69 +4559,69 @@ json5@^2.1.2:
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jss-plugin-camel-case@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.2.tgz#76dddfa32f9e62d17daa4e3504991fd0933b89e1"
-  integrity sha512-wgBPlL3WS0WDJ1lPJcgjux/SHnDuu7opmgQKSraKs4z8dCCyYMx9IDPFKBXQ8Q5dVYij1FFV0WdxyhuOOAXuTg==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c"
+  integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     hyphenate-style-name "^1.0.3"
-    jss "10.9.2"
+    jss "10.10.0"
 
 jss-plugin-default-unit@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.2.tgz#3e7f4a1506b18d8fe231554fd982439feb2a9c53"
-  integrity sha512-pYg0QX3bBEFtTnmeSI3l7ad1vtHU42YEEpgW7pmIh+9pkWNWb5dwS/4onSfAaI0kq+dOZHzz4dWe+8vWnanoSg==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293"
+  integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.2"
+    jss "10.10.0"
 
 jss-plugin-global@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.2.tgz#e7f2ad4a5e8e674fb703b04b57a570b8c3e5c2c2"
-  integrity sha512-GcX0aE8Ef6AtlasVrafg1DItlL/tWHoC4cGir4r3gegbWwF5ZOBYhx04gurPvWHC8F873aEGqge7C17xpwmp2g==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd"
+  integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.2"
+    jss "10.10.0"
 
 jss-plugin-nested@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.2.tgz#3aa2502816089ecf3981e1a07c49b276d67dca63"
-  integrity sha512-VgiOWIC6bvgDaAL97XCxGD0BxOKM0K0zeB/ECyNaVF6FqvdGB9KBBWRdy2STYAss4VVA7i5TbxFZN+WSX1kfQA==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219"
+  integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.2"
+    jss "10.10.0"
     tiny-warning "^1.0.2"
 
 jss-plugin-props-sort@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.2.tgz#645f6c8f179309667b3e6212f66b59a32fb3f01f"
-  integrity sha512-AP1AyUTbi2szylgr+O0OB7gkIxEGzySLITZ2GpsaoX72YMCGI2jYAc+WUhPfvUnZYiauF4zTnN4V4TGuvFjJlw==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7"
+  integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.2"
+    jss "10.10.0"
 
 jss-plugin-rule-value-function@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.2.tgz#9afe07596e477123cbf11120776be6a64494541f"
-  integrity sha512-vf5ms8zvLFMub6swbNxvzsurHfUZ5Shy5aJB2gIpY6WNA3uLinEcxYyraQXItRHi5ivXGqYciFDRM2ZoVoRZ4Q==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b"
+  integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.2"
+    jss "10.10.0"
     tiny-warning "^1.0.2"
 
 jss-plugin-vendor-prefixer@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.2.tgz#410a0f3b9f8dbbfba58f4d329134df4849aa1237"
-  integrity sha512-SxcEoH+Rttf9fEv6KkiPzLdXRmI6waOTcMkbbEFgdZLDYNIP9UKNHFy6thhbRKqv0XMQZdrEsbDyV464zE/dUA==
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7"
+  integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==
   dependencies:
     "@babel/runtime" "^7.3.1"
     css-vendor "^2.0.8"
-    jss "10.9.2"
+    jss "10.10.0"
 
-jss@10.9.2, jss@^10.5.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.2.tgz#9379be1f195ef98011dfd31f9448251bd61b95a9"
-  integrity sha512-b8G6rWpYLR4teTUbGd4I4EsnWjg7MN0Q5bSsjKhVkJVjhQDy2KzkbD2AW3TuT0RYZVmZZHKIrXDn6kjU14qkUg==
+jss@10.10.0, jss@^10.5.1:
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc"
+  integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     csstype "^3.0.2"
@@ -4629,14 +4629,14 @@ jss@10.9.2, jss@^10.5.1:
     tiny-warning "^1.0.2"
 
 jszip@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
     readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
+    setimmediate "^1.0.5"
 
 keycode@^2.2.0:
   version "2.2.0"
@@ -4832,6 +4832,16 @@ manifesto.js@^4.1.0:
     isomorphic-unfetch "^3.0.0"
     lodash "^4.17.21"
 
+manifesto.js@^4.2.14:
+  version "4.2.17"
+  resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.17.tgz#9d06dd50f5442a80897ccf7d88dfe861afb6a343"
+  integrity sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA==
+  dependencies:
+    "@edsilv/http-status-codes" "^1.0.3"
+    "@iiif/vocabulary" "^1.0.26"
+    isomorphic-unfetch "^3.0.0"
+    lodash "^4.17.21"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -6581,9 +6591,9 @@ react-overlays@^5.1.1:
     warning "^4.0.3"
 
 react-redux@^7.2.6:
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.8.tgz#a894068315e65de5b1b68899f9c6ee0923dd28de"
-  integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==
+  version "7.2.9"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
+  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@types/react-redux" "^7.1.20"
@@ -6594,7 +6604,7 @@ react-redux@^7.2.6:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
   version "1.1.0"
-  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#649f6e415a414c04e231e9f400bf268915209956"
+  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#c29229daf1b2efe398f55cb8dfc0c603bdd6441d"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@fortawesome/fontawesome-svg-core" "^1.2.4"
@@ -6603,9 +6613,9 @@ react-redux@^7.2.6:
     "@material-ui/core" "^4.12.0"
     "@material-ui/icons" "4.2.1"
     axios "^0.21.2"
-    base-64 "^0.1.0"
     hls.js "^1.1.2"
     lodash "4.17.21"
+    manifesto.js "^4.2.14"
     peaks.js "^0.26.0"
     prop-types "^15.6.2"
     react-bootstrap "1.6.4"
@@ -6710,14 +6720,14 @@ readdirp@~3.6.0:
     picomatch "^2.2.1"
 
 redux-thunk@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
-  integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
+  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
 
 redux@^4.0.0, redux@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
-  integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
@@ -6733,6 +6743,11 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
+regenerator-runtime@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
 regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
@@ -7126,11 +7141,6 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
 set-value@^2.0.0, set-value@^2.0.1, set-value@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-4.1.0.tgz#aa433662d87081b75ad88a4743bd450f044e7d09"
@@ -7139,10 +7149,10 @@ set-value@^2.0.0, set-value@^2.0.1, set-value@^4.1.0:
     is-plain-object "^2.0.4"
     is-primitive "^3.0.1"
 
-setimmediate@^1.0.4:
+setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
 setprototypeof@1.1.0:
   version "1.1.0"