Use TryAdd instead of Add (#14997 )

Validate encoder path (#14996 )
Handle es-419 in TMDb (#14946 )
2025-12-10 11:03:04 +03:00 · 2025-10-13 22:18:37 +02:00 · 2025-10-13 14:16:05 -06:00 · 2025-10-13 13:47:16 -06:00 · 2025-10-13 12:32:41 -06:00 · 2025-10-13 10:09:40 -06:00
152 changed files with 6049 additions and 1098 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "dotnet-ef": {
-      "version": "9.0.8",
+      "version": "9.0.9",
      "commands": [
        "dotnet-ef"
      ]
--- a/.editorconfig
+++ b/.editorconfig
@@ -294,6 +294,9 @@ dotnet_diagnostic.CA1854.severity = error
 # error on CA1860: Avoid using 'Enumerable.Any()' extension method
 dotnet_diagnostic.CA1860.severity = error

+# error on CA1861: Avoid constant arrays as arguments
+dotnet_diagnostic.CA1861.severity = error
+
 # error on CA1862: Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
 dotnet_diagnostic.CA1862.severity = error

--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -22,16 +22,16 @@ jobs:
    - name: Checkout repository
      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
    - name: Setup .NET
-      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
      with:
        dotnet-version: '9.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+      uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended
    - name: Autobuild
-      uses: github/codeql-action/autobuild@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+      uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+      uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
--- a/.github/workflows/ci-compat.yml
+++ b/.github/workflows/ci-compat.yml
@@ -17,7 +17,7 @@ jobs:
          repository: ${{ github.event.pull_request.head.repo.full_name }}

      - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
        with:
          dotnet-version: '9.0.x'

@@ -47,7 +47,7 @@ jobs:
          fetch-depth: 0

      - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
        with:
          dotnet-version: '9.0.x'

@@ -115,7 +115,7 @@ jobs:
          } >> $GITHUB_OUTPUT

      - name: Find difference comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
+        uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
        id: find-comment
        with:
          issue-number: ${{ github.event.pull_request.number }}
@@ -123,7 +123,7 @@ jobs:
          body-includes: abi-diff-workflow-comment

      - name: Reply or edit difference comment (changed)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        if: ${{ steps.diff.outputs.body != '' }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
@@ -142,7 +142,7 @@ jobs:
            </details>

      - name: Reply or edit difference comment (unchanged)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        if: ${{ steps.diff.outputs.body == '' && steps.find-comment.outputs.comment-id != '' }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
--- a/.github/workflows/ci-openapi.yml
+++ b/.github/workflows/ci-openapi.yml
@@ -21,7 +21,7 @@ jobs:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
      - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
        with:
          dotnet-version: '9.0.x'
      - name: Generate openapi.json
@@ -55,7 +55,7 @@ jobs:
          ANCESTOR_REF=$(git merge-base upstream/${{ github.base_ref }} origin/$HEAD_REF)
          git checkout --progress --force $ANCESTOR_REF
      - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
        with:
          dotnet-version: '9.0.x'
      - name: Generate openapi.json
@@ -120,14 +120,14 @@ jobs:
          echo "" >> openapi-changes-reply.md
          echo "</details>" >> openapi-changes-reply.md
      - name: Find difference comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
+        uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
        id: find-comment
        with:
          issue-number: ${{ github.event.pull_request.number }}
          direction: last
          body-includes: openapi-diff-workflow-comment
      - name: Reply or edit difference comment (changed)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        if: ${{ steps.read-diff.outputs.ApiChanged == '1' }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
@@ -135,7 +135,7 @@ jobs:
          edit-mode: replace
          body-path: openapi-changes-reply.md
      - name: Edit difference comment (unchanged)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        if: ${{ steps.read-diff.outputs.ApiChanged == '0' && steps.find-comment.outputs.comment-id != '' }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -22,7 +22,7 @@ jobs:
    steps:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

-      - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
        with:
          dotnet-version: ${{ env.SDK_VERSION }}

@@ -35,7 +35,7 @@ jobs:
          --verbosity minimal

      - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@c4c5175a441c6603ec614f5084386dabe0e2295b # v5.4.12
+        uses: danielpalme/ReportGenerator-GitHub-Action@9870ed167742d546b99962ff815fcc1098355ed8 # v5.4.17
        with:
          reports: "**/coverage.cobertura.xml"
          targetdir: "merged/"
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Notify as seen
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        with:
          token: ${{ secrets.JF_BOT_TOKEN }}
          comment-id: ${{ github.event.comment.id }}
@@ -44,9 +44,9 @@ jobs:
        with:
          repository: jellyfin/jellyfin-triage-script
      - name: install python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
-          python-version: '3.13'
+          python-version: '3.14'
          cache: 'pip'
      - name: install python packages
        run: pip install -r rename/requirements.txt
--- a/.github/workflows/issue-stale.yml
+++ b/.github/workflows/issue-stale.yml
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
--- a/.github/workflows/issue-template-check.yml
+++ b/.github/workflows/issue-template-check.yml
@@ -14,9 +14,9 @@ jobs:
        with:
          repository: jellyfin/jellyfin-triage-script
      - name: install python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
-          python-version: '3.13'
+          python-version: '3.14'
          cache: 'pip'
      - name: install python packages
        run: pip install -r main-repo-triage/requirements.txt
--- a/.github/workflows/pull-request-stale.yaml
+++ b/.github/workflows/pull-request-stale.yaml
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -31,6 +31,7 @@
 - [DaveChild](https://github.com/DaveChild)
 - [DavidFair](https://github.com/DavidFair)
 - [Delgan](https://github.com/Delgan)
+ - [Derpipose](https://github.com/Derpipose)
 - [dcrdev](https://github.com/dcrdev)
 - [dhartung](https://github.com/dhartung)
 - [dinki](https://github.com/dinki)
@@ -140,6 +141,7 @@
 - [ThibaultNocchi](https://github.com/ThibaultNocchi)
 - [thornbill](https://github.com/thornbill)
 - [ThreeFive-O](https://github.com/ThreeFive-O)
+ - [tjwalkr3](https://github.com/tjwalkr3)
 - [TrisMcC](https://github.com/TrisMcC)
 - [trumblejoe](https://github.com/trumblejoe)
 - [TtheCreator](https://github.com/TtheCreator)
@@ -202,6 +204,7 @@
 - [Shoham Peller](https://github.com/spellr)
 - [theshoeshiner](https://github.com/theshoeshiner)
 - [TokerX](https://github.com/TokerX)
+ - [GeneMarks](https://github.com/GeneMarks)

 # Emby Contributors

--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,4 +19,9 @@
    <AdditionalFiles Include="$(MSBuildThisFileDirectory)/stylecop.json" />
  </ItemGroup>

+  <!-- Custom Analyzers -->
+  <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Jellyfin.CodeAnalysis' AND '$(Configuration)' == 'Debug' ">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj" OutputItemType="Analyzer" />
+  </ItemGroup>
+
 </Project>
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
  </PropertyGroup>
  <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
  <ItemGroup Label="Package Dependencies">
-    <PackageVersion Include="AsyncKeyedLock" Version="7.1.6" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.1.7" />
    <PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
    <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
    <PackageVersion Include="AutoFixture" Version="4.18.1" />
@@ -17,7 +17,7 @@
    <PackageVersion Include="Diacritics" Version="4.0.17" />
    <PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
    <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
-    <PackageVersion Include="FsCheck.Xunit" Version="3.3.0" />
+    <PackageVersion Include="FsCheck.Xunit" Version="3.3.1" />
    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.1" />
    <PackageVersion Include="ICU4N.Transliterator" Version="60.1.0-alpha.356" />
    <PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
@@ -26,40 +26,43 @@
    <PackageVersion Include="libse" Version="4.0.12" />
    <PackageVersion Include="LrcParser" Version="2025.623.0" />
    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
    <PackageVersion Include="MimeTypes" Version="2.5.2" />
    <PackageVersion Include="Morestachio" Version="5.0.1.631" />
    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="NEbml" Version="1.0.0.3" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NEbml" Version="1.1.0.5" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
    <PackageVersion Include="PlaylistsNET" Version="1.4.1" />
    <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
    <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.1" />
    <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="Polly" Version="8.6.2" />
+    <PackageVersion Include="Polly" Version="8.6.4" />
    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
    <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
    <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
@@ -70,27 +73,27 @@
    <PackageVersion Include="Serilog.Sinks.Graylog" Version="3.1.1" />
    <PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
    <PackageVersion Include="SharpFuzz" Version="2.2.0" />
-     <!-- Pinned to 3.116.1 because https://github.com/jellyfin/jellyfin/pull/14255 -->
+    <!-- Pinned to 3.116.1 because https://github.com/jellyfin/jellyfin/pull/14255 -->
    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.116.1" />
    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />
    <PackageVersion Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="Svg.Skia" Version="3.0.5" />
+    <PackageVersion Include="Svg.Skia" Version="3.2.1" />
    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.5.0" />
    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />
    <PackageVersion Include="System.Globalization" Version="4.3.0" />
    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.9" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.9" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.9" />
    <PackageVersion Include="TagLibSharp" Version="2.3.0" />
-    <PackageVersion Include="z440.atl.core" Version="7.3.0" />
-    <PackageVersion Include="TMDbLib" Version="2.2.0" />
+    <PackageVersion Include="z440.atl.core" Version="7.5.0" />
+    <PackageVersion Include="TMDbLib" Version="2.3.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
    <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
    <PackageVersion Include="xunit" Version="2.9.3" />
  </ItemGroup>
-</Project>
+</Project>
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -21,8 +21,8 @@ namespace Emby.Naming.Common
        /// </summary>
        public NamingOptions()
        {
-            VideoFileExtensions = new[]
-            {
+            VideoFileExtensions =
+            [
                ".001",
                ".3g2",
                ".3gp",
@@ -77,10 +77,10 @@ namespace Emby.Naming.Common
                ".wmv",
                ".wtv",
                ".xvid"
-            };
+            ];

-            VideoFlagDelimiters = new[]
-            {
+            VideoFlagDelimiters =
+            [
                '(',
                ')',
                '-',
@@ -88,15 +88,15 @@ namespace Emby.Naming.Common
                '_',
                '[',
                ']'
-            };
+            ];

-            StubFileExtensions = new[]
-            {
+            StubFileExtensions =
+            [
                ".disc"
-            };
+            ];

-            StubTypes = new[]
-            {
+            StubTypes =
+            [
                new StubTypeRule(
                    stubType: "dvd",
                    token: "dvd"),
@@ -136,32 +136,32 @@ namespace Emby.Naming.Common
                new StubTypeRule(
                    stubType: "tv",
                    token: "DSR")
-            };
+            ];

-            VideoFileStackingRules = new[]
-            {
+            VideoFileStackingRules =
+            [
                new FileStackRule(@"^(?<filename>.*?)(?:(?<=[\]\)\}])|[ _.-]+)[\(\[]?(?<parttype>cd|dvd|part|pt|dis[ck])[ _.-]*(?<number>[0-9]+)[\)\]]?(?:\.[^.]+)?$", true),
                new FileStackRule(@"^(?<filename>.*?)(?:(?<=[\]\)\}])|[ _.-]+)[\(\[]?(?<parttype>cd|dvd|part|pt|dis[ck])[ _.-]*(?<number>[a-d])[\)\]]?(?:\.[^.]+)?$", false)
-            };
+            ];

-            CleanDateTimes = new[]
-            {
+            CleanDateTimes =
+            [
                @"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19[0-9]{2}|20[0-9]{2})(?![0-9]+|\W[0-9]{2}\W[0-9]{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19[0-9]{2}|20[0-9]{2})*",
                @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19[0-9]{2}|20[0-9]{2})(?![0-9]+|\W[0-9]{2}\W[0-9]{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19[0-9]{2}|20[0-9]{2})*"
-            };
+            ];

-            CleanStrings = new[]
-            {
+            CleanStrings =
+            [
                @"^\s*(?<cleaned>.+?)[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multi|subs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|blu-ray|x264|x265|h264|h265|xvid|xvidvd|xxx|www.www|AAC|DTS|\[.*\])([ _\,\.\(\)\[\]\-]|$)",
                @"^(?<cleaned>.+?)(\[.*\])",
                @"^\s*(?<cleaned>.+?)\WE[0-9]+(-|~)E?[0-9]+(\W|$)",
                @"^\s*\[[^\]]+\](?!\.\w+$)\s*(?<cleaned>.+)",
                @"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$",
                @"^\s*(?<cleaned>.+?)(([-._ ](trailer|sample))|-(scene|clip|behindthescenes|deleted|deletedscene|featurette|short|interview|other|extra))$"
-            };
+            ];

-            SubtitleFileExtensions = new[]
-            {
+            SubtitleFileExtensions =
+            [
                ".ass",
                ".mks",
                ".sami",
@@ -171,17 +171,17 @@ namespace Emby.Naming.Common
                ".sub",
                ".sup",
                ".vtt",
-            };
+            ];

-            LyricFileExtensions = new[]
-            {
+            LyricFileExtensions =
+            [
                ".lrc",
                ".elrc",
                ".txt"
-            };
+            ];

-            AlbumStackingPrefixes = new[]
-            {
+            AlbumStackingPrefixes =
+            [
                "cd",
                "digital media",
                "disc",
@@ -190,10 +190,10 @@ namespace Emby.Naming.Common
                "volume",
                "part",
                "act"
-            };
+            ];

-            ArtistSubfolders = new[]
-            {
+            ArtistSubfolders =
+            [
                "albums",
                "broadcasts",
                "bootlegs",
@@ -208,10 +208,10 @@ namespace Emby.Naming.Common
                "soundtracks",
                "spokenwords",
                "streets"
-            };
+            ];

-            AudioFileExtensions = new[]
-            {
+            AudioFileExtensions =
+            [
                ".669",
                ".3gp",
                ".aa",
@@ -241,6 +241,7 @@ namespace Emby.Naming.Common
                ".dts",
                ".dvf",
                ".eac3",
+                ".ec3",
                ".far",
                ".flac",
                ".gdm",
@@ -291,33 +292,33 @@ namespace Emby.Naming.Common
                ".xm",
                ".xsp",
                ".ymf"
-            };
+            ];

-            MediaFlagDelimiters = new[]
-            {
+            MediaFlagDelimiters =
+            [
                '.'
-            };
+            ];

-            MediaForcedFlags = new[]
-            {
+            MediaForcedFlags =
+            [
                "foreign",
                "forced"
-            };
+            ];

-            MediaDefaultFlags = new[]
-            {
+            MediaDefaultFlags =
+            [
                "default"
-            };
+            ];

-            MediaHearingImpairedFlags = new[]
-            {
+            MediaHearingImpairedFlags =
+            [
                "cc",
                "hi",
                "sdh"
-            };
+            ];

-            EpisodeExpressions = new[]
-            {
+            EpisodeExpressions =
+            [
                // *** Begin Kodi Standard Naming
                // <!-- foo.s01.e01, foo.s01_e01, S01E02 foo, S01 - E02 -->
                new EpisodeExpression(@".*(\\|\/)(?<seriesname>((?![Ss]([0-9]+)[][ ._-]*[Ee]([0-9]+))[^\\\/])*)?[Ss](?<seasonnumber>[0-9]+)[][ ._-]*[Ee](?<epnumber>[0-9]+)([^\\/]*)$")
@@ -330,23 +331,23 @@ namespace Emby.Naming.Common
                new EpisodeExpression(@"[^\\/]*?()\.?[Ee]([0-9]+)\.([^\\/]*)$"),
                new EpisodeExpression("(?<year>[0-9]{4})[._ -](?<month>[0-9]{2})[._ -](?<day>[0-9]{2})", true)
                {
-                    DateTimeFormats = new[]
-                    {
+                    DateTimeFormats =
+                    [
                        "yyyy.MM.dd",
                        "yyyy-MM-dd",
                        "yyyy_MM_dd",
                        "yyyy MM dd"
-                    }
+                    ]
                },
                new EpisodeExpression("(?<day>[0-9]{2})[._ -](?<month>[0-9]{2})[._ -](?<year>[0-9]{4})", true)
                {
-                    DateTimeFormats = new[]
-                    {
+                    DateTimeFormats =
+                    [
                        "dd.MM.yyyy",
                        "dd-MM-yyyy",
                        "dd_MM_yyyy",
                        "dd MM yyyy"
-                    }
+                    ]
                },

                // This isn't a Kodi naming rule, but the expression below causes false episode numbers for
@@ -478,10 +479,10 @@ namespace Emby.Naming.Common
                {
                    IsNamed = true
                },
-            };
+            ];

-            VideoExtraRules = new[]
-            {
+            VideoExtraRules =
+            [
                new ExtraRule(
                    ExtraType.Trailer,
                    ExtraRuleType.DirectoryName,
@@ -691,14 +692,14 @@ namespace Emby.Naming.Common
                    ExtraRuleType.Suffix,
                    "-other",
                    MediaType.Video)
-            };
+            ];

            AllExtrasTypesFolderNames = VideoExtraRules
                .Where(i => i.RuleType == ExtraRuleType.DirectoryName)
                .ToDictionary(i => i.Token, i => i.ExtraType, StringComparer.OrdinalIgnoreCase);

-            Format3DRules = new[]
-            {
+            Format3DRules =
+            [
                // Kodi rules:
                new Format3DRule(
                    precedingToken: "3d",
@@ -725,10 +726,10 @@ namespace Emby.Naming.Common
                new Format3DRule("tab"),
                new Format3DRule("sbs3d"),
                new Format3DRule("mvc")
-            };
+            ];

-            AudioBookPartsExpressions = new[]
-            {
+            AudioBookPartsExpressions =
+            [
                // Detect specified chapters, like CH 01
                @"ch(?:apter)?[\s_-]?(?<chapter>[0-9]+)",
                // Detect specified parts, like Part 02
@@ -741,14 +742,14 @@ namespace Emby.Naming.Common
                "(?<chapter>[0-9]+)_(?<part>[0-9]+)",
                // Some audiobooks are ripped from cd's, and will be named by disk number.
                @"dis(?:c|k)[\s_-]?(?<chapter>[0-9]+)"
-            };
+            ];

-            AudioBookNamesExpressions = new[]
-            {
+            AudioBookNamesExpressions =
+            [
                // Detect year usually in brackets after name Batman (2020)
                @"^(?<name>.+?)\s*\(\s*(?<year>[0-9]{4})\s*\)\s*$",
                @"^\s*(?<name>[^ ].*?)\s*$"
-            };
+            ];

            MultipleEpisodeExpressions = new[]
            {
@@ -888,12 +889,12 @@ namespace Emby.Naming.Common
        /// <summary>
        /// Gets list of clean datetime regular expressions.
        /// </summary>
-        public Regex[] CleanDateTimeRegexes { get; private set; } = Array.Empty<Regex>();
+        public Regex[] CleanDateTimeRegexes { get; private set; } = [];

        /// <summary>
        /// Gets list of clean string regular expressions.
        /// </summary>
-        public Regex[] CleanStringRegexes { get; private set; } = Array.Empty<Regex>();
+        public Regex[] CleanStringRegexes { get; private set; } = [];

        /// <summary>
        /// Compiles raw regex strings into regexes.
--- a/Emby.Naming/Video/StackResolver.cs
+++ b/Emby.Naming/Video/StackResolver.cs
@@ -132,7 +132,7 @@ namespace Emby.Naming.Video
            }
        }

-        private class StackMetadata
+        private sealed class StackMetadata
        {
            public StackMetadata(bool isDirectory, bool isNumerical, string partType)
            {
--- a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
+++ b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
@@ -108,7 +108,7 @@ namespace Emby.Server.Implementations.AppBase
        private void CheckOrCreateMarker(string path, string markerName, bool recursive = false)
        {
            var otherMarkers = GetMarkers(path, recursive).FirstOrDefault(e => Path.GetFileName(e) != markerName);
-            if (otherMarkers != null)
+            if (otherMarkers is not null)
            {
                throw new InvalidOperationException($"Exepected to find only {markerName} but found marker for {otherMarkers}.");
            }
--- a/Emby.Server.Implementations/Chapters/ChapterManager.cs
+++ b/Emby.Server.Implementations/Chapters/ChapterManager.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -251,23 +250,9 @@ public class ChapterManager : IChapterManager
    }

    /// <inheritdoc />
-    public void DeleteChapterImages(Video video)
+    public async Task DeleteChapterDataAsync(Guid itemId, CancellationToken cancellationToken)
    {
-        var path = _pathManager.GetChapterImageFolderPath(video);
-        try
-        {
-            if (Directory.Exists(path))
-            {
-                _logger.LogInformation("Removing chapter images for {Name} [{Id}]", video.Name, video.Id);
-                Directory.Delete(path, true);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning("Failed to remove chapter image folder for {Item}: {Exception}", video.Id, ex);
-        }
-
-        _chapterRepository.DeleteChapters(video.Id);
+        await _chapterRepository.DeleteChaptersAsync(itemId, cancellationToken).ConfigureAwait(false);
    }

    private IReadOnlyList<string> GetSavedChapterImages(Video video, IDirectoryService directoryService)
--- a/Emby.Server.Implementations/Collections/CollectionManager.cs
+++ b/Emby.Server.Implementations/Collections/CollectionManager.cs
@@ -104,6 +104,8 @@ namespace Emby.Server.Implementations.Collections

            await _libraryManager.AddVirtualFolder(name, CollectionTypeOptions.boxsets, libraryOptions, true).ConfigureAwait(false);

+            _libraryManager.RootFolder.Children = null;
+
            return FindFolders(path).First();
        }

--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -50,6 +50,8 @@ public class CleanDatabaseScheduledTask : ILibraryPostScanTask

        _logger.LogDebug("Cleaning {Number} items with dead parents", numItems);

+        IProgress<double> subProgress = new Progress<double>((val) => progress.Report(val / 2));
+
        foreach (var itemId in itemIds)
        {
            cancellationToken.ThrowIfCancellationRequested();
@@ -95,9 +97,10 @@ public class CleanDatabaseScheduledTask : ILibraryPostScanTask
            numComplete++;
            double percent = numComplete;
            percent /= numItems;
-            progress.Report(percent * 100);
+            subProgress.Report(percent * 100);
        }

+        subProgress = new Progress<double>((val) => progress.Report((val / 2) + 50));
        var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
        await using (context.ConfigureAwait(false))
        {
@@ -105,7 +108,9 @@ public class CleanDatabaseScheduledTask : ILibraryPostScanTask
            await using (transaction.ConfigureAwait(false))
            {
                await context.ItemValues.Where(e => e.BaseItemsMap!.Count == 0).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+                subProgress.Report(50);
                await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+                subProgress.Report(100);
            }
        }

--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1051,30 +1051,15 @@ namespace Emby.Server.Implementations.Dto

                // Include artists that are not in the database yet, e.g., just added via metadata editor
                // var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList();
-                dto.ArtistItems = hasArtist.Artists
-                    // .Except(foundArtists, new DistinctNameComparer())
+                dto.ArtistItems = _libraryManager.GetArtists([.. hasArtist.Artists.Where(e => !string.IsNullOrWhiteSpace(e))])
+                    .Where(e => e.Value.Length > 0)
                    .Select(i =>
                    {
-                        // This should not be necessary but we're seeing some cases of it
-                        if (string.IsNullOrEmpty(i))
+                        return new NameGuidPair
                        {
-                            return null;
-                        }
-
-                        var artist = _libraryManager.GetArtist(i, new DtoOptions(false)
-                        {
-                            EnableImages = false
-                        });
-                        if (artist is not null)
-                        {
-                            return new NameGuidPair
-                            {
-                                Name = artist.Name,
-                                Id = artist.Id
-                            };
-                        }
-
-                        return null;
+                            Name = i.Key,
+                            Id = i.Value.First().Id
+                        };
                    }).Where(i => i is not null).ToArray();
            }

--- a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -37,6 +37,11 @@ namespace Emby.Server.Implementations.Library
                return false;
            }

+            if (IgnorePatterns.ShouldIgnore(fileInfo.FullName))
+            {
+                return true;
+            }
+
            // Don't ignore top level folders
            if (fileInfo.IsDirectory
                && (parent is AggregateFolder || (parent?.IsTopParent ?? false)))
@@ -44,11 +49,6 @@ namespace Emby.Server.Implementations.Library
                return false;
            }

-            if (IgnorePatterns.ShouldIgnore(fileInfo.FullName))
-            {
-                return true;
-            }
-
            if (parent is null)
            {
                return false;
--- a/Emby.Server.Implementations/Library/DotIgnoreIgnoreRule.cs
+++ b/Emby.Server.Implementations/Library/DotIgnoreIgnoreRule.cs
@@ -50,6 +50,13 @@ public class DotIgnoreIgnoreRule : IResolverIgnoreRule
                return false;
            }

+            // Fast path in case the ignore files isn't a symlink and is empty
+            if ((dirIgnoreFile.Attributes & FileAttributes.ReparsePoint) == 0
+                && dirIgnoreFile.Length == 0)
+            {
+                return true;
+            }
+
            // ignore the directory only if the .ignore file is empty
            // evaluate individual files otherwise
            return string.IsNullOrWhiteSpace(GetFileContent(dirIgnoreFile));
--- a/Emby.Server.Implementations/Library/ExternalDataManager.cs
+++ b/Emby.Server.Implementations/Library/ExternalDataManager.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.MediaSegments;
@@ -20,6 +21,7 @@ public class ExternalDataManager : IExternalDataManager
    private readonly IMediaSegmentManager _mediaSegmentManager;
    private readonly IPathManager _pathManager;
    private readonly ITrickplayManager _trickplayManager;
+    private readonly IChapterManager _chapterManager;
    private readonly ILogger<ExternalDataManager> _logger;

    /// <summary>
@@ -29,18 +31,21 @@ public class ExternalDataManager : IExternalDataManager
    /// <param name="mediaSegmentManager">The media segment manager.</param>
    /// <param name="pathManager">The path manager.</param>
    /// <param name="trickplayManager">The trickplay manager.</param>
+    /// <param name="chapterManager">The chapter manager.</param>
    /// <param name="logger">The logger.</param>
    public ExternalDataManager(
        IKeyframeManager keyframeManager,
        IMediaSegmentManager mediaSegmentManager,
        IPathManager pathManager,
        ITrickplayManager trickplayManager,
+        IChapterManager chapterManager,
        ILogger<ExternalDataManager> logger)
    {
        _keyframeManager = keyframeManager;
        _mediaSegmentManager = mediaSegmentManager;
        _pathManager = pathManager;
        _trickplayManager = trickplayManager;
+        _chapterManager = chapterManager;
        _logger = logger;
    }

@@ -67,5 +72,6 @@ public class ExternalDataManager : IExternalDataManager
        await _keyframeManager.DeleteKeyframeDataAsync(itemId, cancellationToken).ConfigureAwait(false);
        await _mediaSegmentManager.DeleteSegmentsAsync(itemId, cancellationToken).ConfigureAwait(false);
        await _trickplayManager.DeleteTrickplayDataAsync(itemId, cancellationToken).ConfigureAwait(false);
+        await _chapterManager.DeleteChapterDataAsync(itemId, cancellationToken).ConfigureAwait(false);
    }
 }
--- a/Emby.Server.Implementations/Library/IgnorePatterns.cs
+++ b/Emby.Server.Implementations/Library/IgnorePatterns.cs
@@ -48,6 +48,8 @@ namespace Emby.Server.Implementations.Library
            "**/.wd_tv",
            "**/lost+found/**",
            "**/lost+found",
+            "**/subs/**",
+            "**/subs",

            // Trickplay files
            "**/*.trickplay",
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -327,6 +327,45 @@ namespace Emby.Server.Implementations.Library
            DeleteItem(item, options, parent, notifyParentItem);
        }

+        public void DeleteItemsUnsafeFast(IEnumerable<BaseItem> items)
+        {
+            var pathMaps = items.Select(e => (Item: e, InternalPath: GetInternalMetadataPaths(e), DeletePaths: e.GetDeletePaths())).ToArray();
+
+            foreach (var (item, internalPaths, pathsToDelete) in pathMaps)
+            {
+                foreach (var metadataPath in internalPaths)
+                {
+                    if (!Directory.Exists(metadataPath))
+                    {
+                        continue;
+                    }
+
+                    _logger.LogDebug(
+                        "Deleting metadata path, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
+                        item.GetType().Name,
+                        item.Name ?? "Unknown name",
+                        metadataPath,
+                        item.Id);
+
+                    try
+                    {
+                        Directory.Delete(metadataPath, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Error deleting {MetadataPath}", metadataPath);
+                    }
+                }
+
+                foreach (var fileSystemInfo in pathsToDelete)
+                {
+                    DeleteItemPath(item, false, fileSystemInfo);
+                }
+            }
+
+            _itemRepository.DeleteItem([.. pathMaps.Select(f => f.Item.Id)]);
+        }
+
        public void DeleteItem(BaseItem item, DeleteOptions options, BaseItem parent, bool notifyParentItem)
        {
            ArgumentNullException.ThrowIfNull(item);
@@ -403,59 +442,7 @@ namespace Emby.Server.Implementations.Library

                foreach (var fileSystemInfo in item.GetDeletePaths())
                {
-                    if (Directory.Exists(fileSystemInfo.FullName) || File.Exists(fileSystemInfo.FullName))
-                    {
-                        try
-                        {
-                            _logger.LogInformation(
-                                "Deleting item path, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
-                                item.GetType().Name,
-                                item.Name ?? "Unknown name",
-                                fileSystemInfo.FullName,
-                                item.Id);
-
-                            if (fileSystemInfo.IsDirectory)
-                            {
-                                Directory.Delete(fileSystemInfo.FullName, true);
-                            }
-                            else
-                            {
-                                File.Delete(fileSystemInfo.FullName);
-                            }
-                        }
-                        catch (DirectoryNotFoundException)
-                        {
-                            _logger.LogInformation(
-                                "Directory not found, only removing from database, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
-                                item.GetType().Name,
-                                item.Name ?? "Unknown name",
-                                fileSystemInfo.FullName,
-                                item.Id);
-                        }
-                        catch (FileNotFoundException)
-                        {
-                            _logger.LogInformation(
-                                "File not found, only removing from database, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
-                                item.GetType().Name,
-                                item.Name ?? "Unknown name",
-                                fileSystemInfo.FullName,
-                                item.Id);
-                        }
-                        catch (IOException)
-                        {
-                            if (isRequiredForDelete)
-                            {
-                                throw;
-                            }
-                        }
-                        catch (UnauthorizedAccessException)
-                        {
-                            if (isRequiredForDelete)
-                            {
-                                throw;
-                            }
-                        }
-                    }
+                    DeleteItemPath(item, isRequiredForDelete, fileSystemInfo);

                    isRequiredForDelete = false;
                }
@@ -463,17 +450,73 @@ namespace Emby.Server.Implementations.Library

            item.SetParent(null);

-            _itemRepository.DeleteItem(item.Id);
+            _itemRepository.DeleteItem([item.Id, .. children.Select(f => f.Id)]);
            _cache.TryRemove(item.Id, out _);
            foreach (var child in children)
            {
-                _itemRepository.DeleteItem(child.Id);
                _cache.TryRemove(child.Id, out _);
            }

            ReportItemRemoved(item, parent);
        }

+        private void DeleteItemPath(BaseItem item, bool isRequiredForDelete, FileSystemMetadata fileSystemInfo)
+        {
+            if (Directory.Exists(fileSystemInfo.FullName) || File.Exists(fileSystemInfo.FullName))
+            {
+                try
+                {
+                    _logger.LogInformation(
+                        "Deleting item path, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
+                        item.GetType().Name,
+                        item.Name ?? "Unknown name",
+                        fileSystemInfo.FullName,
+                        item.Id);
+
+                    if (fileSystemInfo.IsDirectory)
+                    {
+                        Directory.Delete(fileSystemInfo.FullName, true);
+                    }
+                    else
+                    {
+                        File.Delete(fileSystemInfo.FullName);
+                    }
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    _logger.LogInformation(
+                        "Directory not found, only removing from database, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
+                        item.GetType().Name,
+                        item.Name ?? "Unknown name",
+                        fileSystemInfo.FullName,
+                        item.Id);
+                }
+                catch (FileNotFoundException)
+                {
+                    _logger.LogInformation(
+                        "File not found, only removing from database, Type: {Type}, Name: {Name}, Path: {Path}, Id: {Id}",
+                        item.GetType().Name,
+                        item.Name ?? "Unknown name",
+                        fileSystemInfo.FullName,
+                        item.Id);
+                }
+                catch (IOException)
+                {
+                    if (isRequiredForDelete)
+                    {
+                        throw;
+                    }
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    if (isRequiredForDelete)
+                    {
+                        throw;
+                    }
+                }
+            }
+        }
+
        private bool IsInternalItem(BaseItem item)
        {
            if (!item.IsFileProtocol)
@@ -485,7 +528,7 @@ namespace Emby.Server.Implementations.Library
            {
                Genre => _configurationManager.ApplicationPaths.GenrePath,
                MusicArtist => _configurationManager.ApplicationPaths.ArtistsPath,
-                MusicGenre => _configurationManager.ApplicationPaths.GenrePath,
+                MusicGenre => _configurationManager.ApplicationPaths.MusicGenrePath,
                Person => _configurationManager.ApplicationPaths.PeoplePath,
                Studio => _configurationManager.ApplicationPaths.StudioPath,
                Year => _configurationManager.ApplicationPaths.YearPath,
@@ -826,6 +869,7 @@ namespace Emby.Server.Implementations.Library

            if (!folder.ParentId.Equals(rootFolder.Id))
            {
+                rootFolder.UpdateToRepositoryAsync(ItemUpdateType.MetadataImport, CancellationToken.None).GetAwaiter().GetResult();
                folder.ParentId = rootFolder.Id;
                folder.UpdateToRepositoryAsync(ItemUpdateType.MetadataImport, CancellationToken.None).GetAwaiter().GetResult();
            }
@@ -989,6 +1033,11 @@ namespace Emby.Server.Implementations.Library
            return GetArtist(name, new DtoOptions(true));
        }

+        public IReadOnlyDictionary<string, MusicArtist[]> GetArtists(IReadOnlyList<string> names)
+        {
+            return _itemRepository.FindArtists(names);
+        }
+
        public MusicArtist GetArtist(string name, DtoOptions options)
        {
            return CreateItemByName<MusicArtist>(MusicArtist.GetPath, name, options);
@@ -1090,6 +1139,7 @@ namespace Emby.Server.Implementations.Library

        public async Task ValidateTopLibraryFolders(CancellationToken cancellationToken, bool removeRoot = false)
        {
+            RootFolder.Children = null;
            await RootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false);

            // Start by just validating the children of the root, but go no further
@@ -1100,9 +1150,12 @@ namespace Emby.Server.Implementations.Library
                allowRemoveRoot: removeRoot,
                cancellationToken: cancellationToken).ConfigureAwait(false);

-            await GetUserRootFolder().RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            var rootFolder = GetUserRootFolder();
+            rootFolder.Children = null;

-            await GetUserRootFolder().ValidateChildren(
+            await rootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+
+            await rootFolder.ValidateChildren(
                new Progress<double>(),
                new MetadataRefreshOptions(new DirectoryService(_fileSystem)),
                recursive: false,
@@ -1110,18 +1163,24 @@ namespace Emby.Server.Implementations.Library
                cancellationToken: cancellationToken).ConfigureAwait(false);

            // Quickly scan CollectionFolders for changes
-            foreach (var child in GetUserRootFolder().Children.OfType<Folder>())
+            var toDelete = new List<Guid>();
+            foreach (var child in rootFolder.Children!.OfType<Folder>())
            {
                // If the user has somehow deleted the collection directory, remove the metadata from the database.
                if (child is CollectionFolder collectionFolder && !Directory.Exists(collectionFolder.Path))
                {
-                    _itemRepository.DeleteItem(collectionFolder.Id);
+                    toDelete.Add(collectionFolder.Id);
                }
                else
                {
                    await child.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                }
            }
+
+            if (toDelete.Count > 0)
+            {
+                _itemRepository.DeleteItem(toDelete.ToArray());
+            }
        }

        private async Task PerformLibraryValidation(IProgress<double> progress, CancellationToken cancellationToken)
@@ -2027,6 +2086,12 @@ namespace Emby.Server.Implementations.Library
                    }
                }

+                if (!File.Exists(image.Path))
+                {
+                    _logger.LogWarning("Image not found at {ImagePath}", image.Path);
+                    continue;
+                }
+
                ImageDimensions size;
                try
                {
@@ -2064,6 +2129,8 @@ namespace Emby.Server.Implementations.Library
                }
            }

+            item.ValidateImages();
+
            _itemRepository.SaveImages(item);

            RegisterItem(item);
@@ -2986,10 +3053,10 @@ namespace Emby.Server.Implementations.Library
            }
            finally
            {
+                await ValidateTopLibraryFolders(CancellationToken.None).ConfigureAwait(false);
+
                if (refreshLibrary)
                {
-                    await ValidateTopLibraryFolders(CancellationToken.None).ConfigureAwait(false);
-
                    StartScanInBackground();
                }
                else
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -657,7 +657,7 @@ namespace Emby.Server.Implementations.Library
                }
                catch (Exception ex)
                {
-                    _logger.LogDebug(ex, "_jsonSerializer.DeserializeFromFile threw an exception.");
+                    _logger.LogDebug(ex, "Error parsing cached media info.");
                }
                finally
                {
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -45,11 +45,14 @@ namespace Emby.Server.Implementations.Library
        public IReadOnlyList<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions)
        {
            var genres = item
-               .GetRecursiveChildren(user, new InternalItemsQuery(user)
-               {
-                   IncludeItemTypes = [BaseItemKind.Audio],
-                   DtoOptions = dtoOptions
-               })
+               .GetRecursiveChildren(
+                user,
+                new InternalItemsQuery(user)
+                {
+                    IncludeItemTypes = [BaseItemKind.Audio],
+                    DtoOptions = dtoOptions
+                },
+                out _)
               .Cast<Audio>()
               .SelectMany(i => i.Genres)
               .Concat(item.Genres)
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -405,6 +405,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies

                if (child.IsDirectory)
                {
+                    if (NamingOptions.AllExtrasTypesFolderNames.ContainsKey(filename))
+                    {
+                        continue;
+                    }
+
                    if (IsDvdDirectory(child.FullName, filename, directoryService))
                    {
                        var movie = new T
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -80,6 +80,7 @@ namespace Emby.Server.Implementations.Library
            var userId = user.InternalId;
            var cacheKey = GetCacheKey(userId, item.Id);
            _cache.AddOrUpdate(cacheKey, userData);
+            item.UserData = dbContext.UserData.Where(e => e.ItemId == item.Id).AsNoTracking().ToArray(); // rehydrate the cached userdata

            UserDataSaved?.Invoke(this, new UserDataSaveEventArgs
            {
@@ -159,7 +160,7 @@ namespace Emby.Server.Implementations.Library
            };
        }

-        private UserItemData Map(UserData dto)
+        private static UserItemData Map(UserData dto)
        {
            return new UserItemData()
            {
@@ -237,7 +238,10 @@ namespace Emby.Server.Implementations.Library
        /// <inheritdoc />
        public UserItemData? GetUserData(User user, BaseItem item)
        {
-            return GetUserData(user, item.Id, item.GetUserDataKeys());
+            return item.UserData?.Where(e => e.UserId.Equals(user.Id)).Select(Map).FirstOrDefault() ?? new UserItemData()
+            {
+                Key = item.GetUserDataKeys()[0],
+            };
        }

        /// <inheritdoc />
@@ -304,7 +308,7 @@ namespace Emby.Server.Implementations.Library
                    // ignore progress during the beginning
                    positionTicks = 0;
                }
-                else if (pctIn > _config.Configuration.MaxResumePct || positionTicks >= runtimeTicks)
+                else if (pctIn > _config.Configuration.MaxResumePct || positionTicks >= (runtimeTicks - TimeSpan.TicksPerSecond))
                {
                    // mark as completed close to the end
                    positionTicks = 0;
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -374,13 +374,22 @@ namespace Emby.Server.Implementations.Library

            if (request.GroupItems)
            {
-                if (parents.OfType<ICollectionFolder>().All(i => i.CollectionType == CollectionType.tvshows))
+                var collectionType = parents
+                    .Select(parent => parent switch
+                    {
+                        ICollectionFolder collectionFolder => collectionFolder.CollectionType,
+                        UserView userView => userView.CollectionType,
+                        _ => null
+                    })
+                    .FirstOrDefault(type => type is not null);
+
+                if (collectionType == CollectionType.tvshows)
                {
                    query.Limit = limit;
                    return _libraryManager.GetLatestItemList(query, parents, CollectionType.tvshows);
                }

-                if (parents.OfType<ICollectionFolder>().All(i => i.CollectionType == CollectionType.music))
+                if (collectionType == CollectionType.music)
                {
                    query.Limit = limit;
                    return _libraryManager.GetLatestItemList(query, parents, CollectionType.music);
--- a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Globalization;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
@@ -55,6 +55,8 @@ public class PeopleValidator

        var numPeople = people.Count;

+        IProgress<double> subProgress = new Progress<double>((val) => progress.Report(val / 2));
+
        _logger.LogDebug("Will refresh {Amount} people", numPeople);

        foreach (var person in people)
@@ -92,7 +94,7 @@ public class PeopleValidator
            double percent = numComplete;
            percent /= numPeople;

-            progress.Report(100 * percent);
+            subProgress.Report(100 * percent);
        }

        var deadEntities = _libraryManager.GetItemList(new InternalItemsQuery
@@ -102,17 +104,13 @@ public class PeopleValidator
            IsLocked = false
        });

-        foreach (var item in deadEntities)
-        {
-            _logger.LogInformation("Deleting dead {ItemType} {ItemId} {ItemName}", item.GetType().Name, item.Id.ToString("N", CultureInfo.InvariantCulture), item.Name);
+        subProgress = new Progress<double>((val) => progress.Report((val / 2) + 50));

-            _libraryManager.DeleteItem(
-                item,
-                new DeleteOptions
-                {
-                    DeleteFileLocation = false
-                },
-                false);
+        var i = 0;
+        foreach (var item in deadEntities.Chunk(500))
+        {
+            _libraryManager.DeleteItemsUnsafeFast(item);
+            subProgress.Report(100f / deadEntities.Count * (i++ * 100));
        }

        progress.Report(100);
--- a/Emby.Server.Implementations/Localization/Core/be.json
+++ b/Emby.Server.Implementations/Localization/Core/be.json
@@ -1,16 +1,16 @@
 {
    "Sync": "Сінхранізаваць",
-    "Playlists": "Спісы прайгравання",
-    "Latest": "Апошні",
+    "Playlists": "Плэй-лісты",
+    "Latest": "Апошняе",
    "LabelIpAddressValue": "IP-адрас: {0}",
-    "ItemAddedWithName": "{0} быў дададзены ў бібліятэку",
+    "ItemAddedWithName": "{0} даданы ў бібліятэку",
    "MessageApplicationUpdated": "Сервер Jellyfin абноўлены",
-    "NotificationOptionApplicationUpdateInstalled": "Абнаўленне прыкладання ўсталявана",
+    "NotificationOptionApplicationUpdateInstalled": "Абнаўленне праграмы ўсталявана",
    "PluginInstalledWithName": "{0} быў усталяваны",
    "UserCreatedWithName": "Карыстальнік {0} быў створаны",
    "Albums": "Альбомы",
-    "Application": "Прыкладанне",
-    "AuthenticationSucceededWithUserName": "{0} паспяхова аўтэнтыфікаваны",
+    "Application": "Праграма",
+    "AuthenticationSucceededWithUserName": "{0} паспяхова аўтарызаваны",
    "Channels": "Каналы",
    "ChapterNameValue": "Раздзел {0}",
    "Collections": "Калекцыі",
@@ -29,18 +29,18 @@
    "HeaderAlbumArtists": "Выканаўцы альбома",
    "LabelRunningTimeValue": "Працягласць: {0}",
    "HomeVideos": "Хатнія відэа",
-    "ItemRemovedWithName": "{0} быў выдалены з бібліятэкі",
-    "MessageApplicationUpdatedTo": "Сервер Jellyfin абноўлены да {0}",
+    "ItemRemovedWithName": "{0} выдалены з бібліятэкі",
+    "MessageApplicationUpdatedTo": "Сервер Jellyfin абноўлены да версіі {0}",
    "Movies": "Фільмы",
    "Music": "Музыка",
    "MusicVideos": "Музычныя кліпы",
-    "NameInstallFailed": "Устаноўка {0} не атрымалася",
+    "NameInstallFailed": "Усталяванне {0} не атрымалася",
    "NameSeasonNumber": "Сезон {0}",
-    "NotificationOptionApplicationUpdateAvailable": "Даступна абнаўленне прыкладання",
+    "NotificationOptionApplicationUpdateAvailable": "Даступна абнаўленне праграмы",
    "NotificationOptionPluginInstalled": "Плагін усталяваны",
-    "NotificationOptionPluginUpdateInstalled": "Абнаўленне плагіна усталявана",
+    "NotificationOptionPluginUpdateInstalled": "Абнаўленне плагіна ўсталявана",
    "NotificationOptionServerRestartRequired": "Патрабуецца перазапуск сервера",
-    "Photos": "Фатаграфіі",
+    "Photos": "Фотаздымкі",
    "Plugin": "Плагін",
    "PluginUninstalledWithName": "{0} быў выдалены",
    "PluginUpdatedWithName": "{0} быў абноўлены",
@@ -54,16 +54,16 @@
    "Artists": "Выканаўцы",
    "UserOfflineFromDevice": "{0} адлучыўся ад {1}",
    "UserPolicyUpdatedWithName": "Палітыка карыстальніка абноўлена для {0}",
-    "TaskCleanActivityLogDescription": "Выдаляе старэйшыя за зададзены ўзрост запісы ў журнале актыўнасці.",
+    "TaskCleanActivityLogDescription": "Выдаляе запісы старэйшыя за зададзены ўзрост ў журнале актыўнасці.",
    "TaskRefreshChapterImagesDescription": "Стварае мініяцюры для відэа, якія маюць раздзелы.",
    "TaskCleanLogsDescription": "Выдаляе файлы журналу, якім больш за {0} дзён.",
-    "TaskUpdatePluginsDescription": "Спампоўвае і ўсталёўвае абнаўленні для плагінаў, якія настроены на аўтаматычнае абнаўленне.",
+    "TaskUpdatePluginsDescription": "Спампоўвае і ўсталёўвае абнаўленні для плагінаў, якія сканфігураваныя на аўтаматычнае абнаўленне.",
    "TaskRefreshChannelsDescription": "Абнаўляе інфармацыю аб інтэрнэт-канале.",
-    "TaskDownloadMissingSubtitlesDescription": "Шукае ў інтэрнэце адсутныя субтытры на аснове канфігурацыі метададзеных.",
-    "TaskOptimizeDatabaseDescription": "Ушчыльняе базу дадзеных і скарачае вольную прастору. Выкананне гэтай задачы пасля сканавання бібліятэкі або ўнясення іншых змяненняў, якія прадугледжваюць мадыфікацыю базы дадзеных, можа палепшыць прадукцыйнасць.",
+    "TaskDownloadMissingSubtitlesDescription": "Шукае ў інтэрнэце адсутныя субцітры на аснове канфігурацыі метададзеных.",
+    "TaskOptimizeDatabaseDescription": "Ушчыльняе базу дадзеных і скарачае вольную прастору. Выкананне гэтай задачы пасля сканавання бібліятэкі або ўнясення іншых зменаў, якія прадугледжваюць мадыфікацыю базы дадзеных, можа палепшыць выдайнасць.",
    "TaskKeyframeExtractor": "Экстрактар ключавых кадраў",
-    "TasksApplicationCategory": "Прыкладанне",
-    "AppDeviceValues": "Прыкладанне: {0}, Прылада: {1}",
+    "TasksApplicationCategory": "Праграма",
+    "AppDeviceValues": "Праграма: {0}, Прылада: {1}",
    "Books": "Кнігі",
    "CameraImageUploadedFrom": "Новая выява камеры была загружана з {0}",
    "DeviceOfflineWithName": "{0} адлучыўся",
@@ -74,7 +74,7 @@
    "HeaderFavoriteArtists": "Абраныя выканаўцы",
    "HearingImpaired": "Са слабым слыхам",
    "Inherit": "Атрымаць у спадчыну",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Канфігурацыя сервера {0} абноўлена",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Канфігурацыя сервера (секцыя {0}) абноўлена",
    "MessageServerConfigurationUpdated": "Канфігурацыя сервера абноўлена",
    "MixedContent": "Змешаны змест",
    "NameSeasonUnknown": "Невядомы сезон",
@@ -92,48 +92,48 @@
    "NotificationOptionVideoPlaybackStopped": "Прайграванне відэа спынена",
    "ScheduledTaskFailedWithName": "{0} не атрымалася",
    "ScheduledTaskStartedWithName": "{0} пачалося",
-    "ServerNameNeedsToBeRestarted": "{0} трэба перазапусціць",
+    "ServerNameNeedsToBeRestarted": "{0} патрабуе перазапуску",
    "Shows": "Шоу",
    "StartupEmbyServerIsLoading": "Jellyfin Server загружаецца. Калі ласка, паўтарыце спробу крыху пазней.",
    "SubtitleDownloadFailureFromForItem": "Не атрымалася спампаваць субтытры з {0} для {1}",
-    "TvShows": "ТБ-шоу",
+    "TvShows": "Тэлепраграма",
    "Undefined": "Нявызначана",
    "UserLockedOutWithName": "Карыстальнік {0} быў заблакіраваны",
    "UserOnlineFromDevice": "{0} падключаны з {1}",
    "UserPasswordChangedWithName": "Пароль быў зменены для карыстальніка {0}",
-    "UserStartedPlayingItemWithValues": "{0} грае {1} на {2}",
+    "UserStartedPlayingItemWithValues": "{0} прайграваецца {1} на {2}",
    "UserStoppedPlayingItemWithValues": "{0} скончыў прайграванне {1} на {2}",
    "ValueHasBeenAddedToLibrary": "{0} быў дададзены ў вашу медыятэку",
    "ValueSpecialEpisodeName": "Спецэпізод - {0}",
    "VersionNumber": "Версія {0}",
    "TasksMaintenanceCategory": "Абслугоўванне",
-    "TasksLibraryCategory": "Медыятэка",
+    "TasksLibraryCategory": "Бібліятэка",
    "TasksChannelsCategory": "Інтэрнэт-каналы",
    "TaskCleanActivityLog": "Ачысціць журнал актыўнасці",
    "TaskCleanCache": "Ачысціць кэш",
    "TaskCleanCacheDescription": "Выдаляе файлы кэша, якія больш не патрэбныя сістэме.",
-    "TaskRefreshChapterImages": "Выняць выявы раздзелаў",
-    "TaskRefreshLibrary": "Сканіраваць медыятэку",
-    "TaskRefreshLibraryDescription": "Сканіруе вашу медыятэку на наяўнасць новых файлаў і абнаўляе метададзеныя.",
-    "TaskCleanLogs": "Ачысціць часопіс",
-    "TaskRefreshPeople": "Абнавіць людзей",
+    "TaskRefreshChapterImages": "Вынуць выявы раздзелаў",
+    "TaskRefreshLibrary": "Сканаваць бібліятэку",
+    "TaskRefreshLibraryDescription": "Скануе вашу медыятэку на наяўнасць новых файлаў і абнаўляе метададзеныя.",
+    "TaskCleanLogs": "Ачысціць журнал",
+    "TaskRefreshPeople": "Абнавіць выканаўцаў",
    "TaskRefreshPeopleDescription": "Абнаўленне метаданых для акцёраў і рэжысёраў у вашай медыятэцы.",
    "TaskUpdatePlugins": "Абнавіць плагіны",
    "TaskCleanTranscode": "Ачысціць каталог перакадзіравання",
    "TaskCleanTranscodeDescription": "Выдаляе перакадзіраваныя файлы, старэйшыя за адзін дзень.",
    "TaskRefreshChannels": "Абнавіць каналы",
-    "TaskDownloadMissingSubtitles": "Спампаваць адсутныя субтытры",
-    "TaskKeyframeExtractorDescription": "Выдае ключавыя кадры з відэафайлаў для стварэння больш дакладных спісаў прайгравання HLS. Гэта задача можа працаваць у працягу доўгага часу.",
-    "TaskRefreshTrickplayImages": "Стварыце выявы Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Стварае прагляд відэаролікаў для Trickplay у падключаных бібліятэках.",
-    "TaskCleanCollectionsAndPlaylists": "Ачысціце калекцыі і спісы прайгравання",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Выдаляе элементы з калекцый і спісаў прайгравання, якія больш не існуюць.",
-    "TaskAudioNormalizationDescription": "Сканіруе файлы на прадмет нармалізацыі гуку.",
+    "TaskDownloadMissingSubtitles": "Спампаваць адсутныя субцітры",
+    "TaskKeyframeExtractorDescription": "Выдае ключавыя кадры з відэафайлаў для стварэння больш дакладных плэй-лістоў HLS. Гэта задача можа працягнуцца шмат часу.",
+    "TaskRefreshTrickplayImages": "Стварыць выявы Trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Стварае перадпрагляды відэаролікаў для Trickplay у падключаных бібліятэках.",
+    "TaskCleanCollectionsAndPlaylists": "Ачысціце калекцыі і плэй-лісты",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Выдаляе элементы з калекцый і плэй-лістоў, якія больш не існуюць.",
+    "TaskAudioNormalizationDescription": "Скануе файлы на прадмет нармалізацыі гуку.",
    "TaskAudioNormalization": "Нармалізацыя гуку",
    "TaskExtractMediaSegmentsDescription": "Выдае або атрымлівае медыясегменты з убудоў з падтрымкай MediaSegment.",
    "TaskMoveTrickplayImagesDescription": "Перамяшчае існуючыя файлы trickplay у адпаведнасці з наладамі бібліятэкі.",
-    "TaskDownloadMissingLyrics": "Спампаваць зніклыя тэксты песень",
-    "TaskDownloadMissingLyricsDescription": "Спампоўвае тэксты для песень",
+    "TaskDownloadMissingLyrics": "Спампаваць адсутныя тэксты песняў",
+    "TaskDownloadMissingLyricsDescription": "Спампоўвае тэксты для песняў",
    "TaskExtractMediaSegments": "Сканіраванне медыя-сегмента",
    "TaskMoveTrickplayImages": "Перанесці месцазнаходжанне выявы Trickplay",
    "CleanupUserDataTask": "Задача па ачыстцы дадзеных карыстальніка",
--- a/Emby.Server.Implementations/Localization/Core/bn.json
+++ b/Emby.Server.Implementations/Localization/Core/bn.json
@@ -15,7 +15,7 @@
    "HeaderFavoriteAlbums": "প্রিয় এলবামগুলো",
    "HeaderContinueWatching": "দেখতে থাকুন",
    "HeaderAlbumArtists": "অ্যালবাম শিল্পীবৃন্দ",
-    "Genres": "জনরা",
+    "Genres": "ধরণ",
    "Folders": "ফোল্ডারসমূহ",
    "Favorites": "পছন্দসমূহ",
    "FailedLoginAttemptWithUserName": "{0} লগিন করতে ব্যর্থ হয়েছে",
@@ -39,8 +39,8 @@
    "Sync": "সমন্বয় করুন",
    "SubtitleDownloadFailureFromForItem": "{0} থেকে {1} এর জন্য সাবটাইটেল ডাউনলোড ব্যর্থ হয়েছে",
    "StartupEmbyServerIsLoading": "জেলিফিন সার্ভার লোড হচ্ছে। দয়া করে একটু পরে আবার চেষ্টা করুন।",
-    "Songs": "সঙ্গীতসমূহ",
-    "Shows": "টিভি পর্ব",
+    "Songs": "সঙ্গীত সমূহ",
+    "Shows": "শো সমূহ",
    "ServerNameNeedsToBeRestarted": "{0} রিস্টার্ট করা প্রয়োজন",
    "ScheduledTaskStartedWithName": "{0} শুরু হয়েছে",
    "ScheduledTaskFailedWithName": "{0} ব্যর্থ",
@@ -51,9 +51,9 @@
    "Plugin": "প্লাগিন",
    "Playlists": "প্লে লিস্ট সমূহ",
    "Photos": "ছবিসমূহ",
-    "NotificationOptionVideoPlaybackStopped": "ভিডিও বন্ধ হয়েছে",
-    "NotificationOptionVideoPlayback": "ভিডিও শুরু হয়েছে",
-    "NotificationOptionUserLockedOut": "ব্যবহারকারী ঢুকতে পারছে না",
+    "NotificationOptionVideoPlaybackStopped": "ভিডিও প্লেব্যাক বন্ধ হয়েছে",
+    "NotificationOptionVideoPlayback": "ভিডিও প্লেব্যাক শুরু হয়েছে",
+    "NotificationOptionUserLockedOut": "ব্যবহারকারী লক আউট হয়েছে",
    "NotificationOptionTaskFailed": "পরিকল্পিত কাজটি ব্যর্থ",
    "NotificationOptionServerRestartRequired": "সার্ভার রিস্টার্ট করা লাগবে",
    "NotificationOptionPluginUpdateInstalled": "প্লাগিন আপডেট ইন্সটল হয়েছে",
@@ -85,7 +85,7 @@
    "LabelIpAddressValue": "আইপি এড্রেস: {0}",
    "ItemRemovedWithName": "{0} লাইব্রেরি থেকে বাদ দেয়া হয়েছে",
    "ItemAddedWithName": "{0} লাইব্রেরিতে যোগ করা হয়েছে",
-    "Inherit": "মূল থেকে গ্রহণ করুন",
+    "Inherit": "উত্তরাধিকারসূত্র থেকে গ্রহণ করুন",
    "HomeVideos": "হোম ভিডিও",
    "HeaderNextUp": "এরপরে আসছে",
    "HeaderLiveTV": "লাইভ টিভি",
@@ -126,16 +126,16 @@
    "TaskKeyframeExtractorDescription": "ভিডিয়ো থেকে কি-ফ্রেম নিষ্কাশনের মাধ্যমে অধিকতর সঠিক HLS প্লে লিস্ট তৈরী করে। এই প্রক্রিয়া দীর্ঘ সময় ধরে চলতে পারে।",
    "TaskRefreshTrickplayImages": "ট্রিকপ্লে ইমেজ তৈরি",
    "TaskRefreshTrickplayImagesDescription": "সক্ষম লাইব্রেরিতে ভিডিওর জন্য ট্রিকপ্লে প্রিভিউ তৈরি করে।",
-    "TaskDownloadMissingLyricsDescription": "গানের লিরিক্স ডাউনলোড করে",
+    "TaskDownloadMissingLyricsDescription": "গানের জন্য লিরিকস ডাউনলোড করুন",
    "TaskCleanCollectionsAndPlaylists": "কালেকশন এবং প্লেলিস্ট পরিষ্কার করুন",
    "TaskCleanCollectionsAndPlaylistsDescription": "কালেকশন এবং প্লেলিস্ট থেকে আইটেমগুলি সরিয়ে দেয় যা আর বিদ্যমান নেই।",
    "TaskExtractMediaSegments": "মিডিয়া সেগমেন্ট স্ক্যান",
-    "TaskExtractMediaSegmentsDescription": "মিডিয়া সেগমেন্ট সক্রিয় প্লাগইনগুলি থেকে মিডিয়া সেগমেন্টগুলি বের করে বা প্রাপ্ত করে।",
+    "TaskExtractMediaSegmentsDescription": "মিডিয়া সেগমেন্ট সক্ষম প্লাগইনগুলি থেকে মিডিয়া সেগমেন্ট বের করে বা অর্জন করে।",
    "TaskDownloadMissingLyrics": "অনুপস্থিত গান ডাউনলোড করুন",
    "TaskMoveTrickplayImagesDescription": "লাইব্রেরির সেটিং অনুযায়ী বিদ্যমান ট্রিকপ্লে ফাইলগুলো সরিয়ে নেবে।",
    "TaskAudioNormalizationDescription": "অডিও নর্মালাইজেশন তথ্যের জন্য ফাইল স্ক্যান করবে।",
    "CleanupUserDataTaskDescription": "৯০ দিন বা তার বেশি সময় ধরে অনুপস্থিত মিডিয়া থেকে সকল ব্যবহারকারীর ডেটা (ওয়াচ স্টেট, ফেভারিট স্ট্যাটাস ইত্যাদি) মুছে ফেলবে।",
    "TaskMoveTrickplayImages": "ট্রিকপ্লে ইমেজের অবস্থান পরিবর্তন",
    "TaskAudioNormalization": "অডিও নর্মলাইজেশন",
-    "CleanupUserDataTask": "ব্যবহারকারীর ডেটা পরিষ্কারের কাজ"
+    "CleanupUserDataTask": "ইউজার ডেটা ক্লিনআপ কাজ"
 }
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -138,5 +138,5 @@
    "TaskMoveTrickplayImages": "Verzeichnis für Trickplay-Bilder migrieren",
    "TaskMoveTrickplayImagesDescription": "Trickplay-Bilder werden entsprechend der Bibliothekseinstellungen verschoben.",
    "CleanupUserDataTask": "Aufgabe zur Bereinigung von Benutzerdaten",
-    "CleanupUserDataTaskDescription": "Löscht alle Benutzerdaten (Anschaustatus, Favoritenstatus, usw.) von Medien, die seit mindestens 90 Tagen nicht mehr vorhanden sind."
+    "CleanupUserDataTaskDescription": "Löscht alle Benutzerdaten (Abspielstatus, Favoritenstatus, usw.) von Medien, die seit mindestens 90 Tagen nicht mehr vorhanden sind."
 }
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -136,5 +136,7 @@
    "TaskExtractMediaSegments": "Escanear Segmentos de Media",
    "TaskExtractMediaSegmentsDescription": "Extrae u obtiene segmentos de medio de plugins habilitados para MediaSegment.",
    "TaskMoveTrickplayImagesDescription": "Mueve archivos existentes de trickplay de acuerdo a la configuración de la biblioteca.",
-    "TaskMoveTrickplayImages": "Migrar Ubicación de Imagen de Trickplay"
+    "TaskMoveTrickplayImages": "Migrar Ubicación de Imagen de Trickplay",
+    "CleanupUserDataTaskDescription": "Limpia todos los datos del usuario (estado de visualización, estado de los favoritos, etc.) que no están presentes en la biblioteca por al menos 90 días.",
+    "CleanupUserDataTask": "Tarea de limpieza de datos de usuarios"
 }
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -137,5 +137,6 @@
    "TaskExtractMediaSegmentsDescription": "Extrae u obtiene segmentos de medios de plugins habilitados para MediaSegment.",
    "TaskMoveTrickplayImages": "Migrar la ubicación de la imagen de Trickplay",
    "TaskMoveTrickplayImagesDescription": "Mueve archivos de trickplay existentes según la configuración de la biblioteca.",
-    "CleanupUserDataTask": "Tarea de limpieza de los datos del usuario"
+    "CleanupUserDataTask": "Tarea de limpieza de los datos del usuario",
+    "CleanupUserDataTaskDescription": "Limpia toda la información de usuario (Estado de última vez visto, favoritos, etc) del archivo media que no está presente por los últimos 90 días."
 }
--- a/Emby.Server.Implementations/Localization/Core/es_DO.json
+++ b/Emby.Server.Implementations/Localization/Core/es_DO.json
@@ -125,5 +125,11 @@
    "Undefined": "Sin definir",
    "TaskCleanActivityLogDescription": "Elimina las entradas del registro de actividad anteriores al periodo configurado.",
    "TaskCleanCacheDescription": "Elimina archivos caché que ya no son necesarios para el sistema.",
-    "TaskCleanLogsDescription": "Elimina archivos de registro con más de {0} días de antigüedad."
+    "TaskCleanLogsDescription": "Elimina archivos de registro con más de {0} días de antigüedad.",
+    "NotificationOptionApplicationUpdateAvailable": "actualización disponible",
+    "TaskDownloadMissingLyrics": "Descargue letras desaparecidas",
+    "TaskDownloadMissingLyricsDescription": "Decarga letras para canciones",
+    "TaskMoveTrickplayImages": "Mover localización de foto vista previa",
+    "NotificationOptionApplicationUpdateInstalled": "Aplicación actualización disponible",
+    "CleanupUserDataTask": "Tarea de limpieza de los datos del usuario"
 }
--- a/Emby.Server.Implementations/Localization/Core/et.json
+++ b/Emby.Server.Implementations/Localization/Core/et.json
@@ -41,10 +41,10 @@
    "StartupEmbyServerIsLoading": "Jellyfin server laadib. Proovi varsti uuesti.",
    "User": "Kasutaja",
    "Undefined": "Määratlemata",
-    "TvShows": "Seriaalid",
+    "TvShows": "Sarjad",
    "System": "Süsteem",
    "Sync": "Sünkrooni",
-    "Songs": "Laulud",
+    "Songs": "Lood",
    "Shows": "Sarjad",
    "ServerNameNeedsToBeRestarted": "{0} tuleb taaskäivitada",
    "ScheduledTaskFailedWithName": "{0} nurjus",
@@ -123,11 +123,11 @@
    "External": "Väline",
    "HearingImpaired": "Kuulmispuudega",
    "TaskKeyframeExtractorDescription": "Eraldab videofailidest võtmekaadreid, et luua täpsemaid HLS-i esitusloendeid. See ülesanne võib kesta pikka aega.",
-    "TaskKeyframeExtractor": "Võtmekaadri ekstraktor",
-    "TaskRefreshTrickplayImages": "Loo eelvaate pildid",
-    "TaskRefreshTrickplayImagesDescription": "Loob eelvaated videotele, kus lubatud.",
-    "TaskAudioNormalization": "Heli Normaliseerimine",
-    "TaskAudioNormalizationDescription": "Skaneerib faile heli normaliseerimise andmete jaoks.",
+    "TaskKeyframeExtractor": "Võtmekaadrite eraldamine",
+    "TaskRefreshTrickplayImages": "Loo trickplay pildid",
+    "TaskRefreshTrickplayImagesDescription": "Loob trickplay eelvaated videotele lubatud meediakogudes.",
+    "TaskAudioNormalization": "Normaliseeri heli",
+    "TaskAudioNormalizationDescription": "Otsib failidest helitugevuse normaliseerimise teavet.",
    "TaskCleanCollectionsAndPlaylistsDescription": "Eemaldab kogumikest ja esitusloenditest asjad, mida enam ei eksisteeri.",
    "TaskCleanCollectionsAndPlaylists": "Puhasta kogumikud ja esitusloendid",
    "TaskDownloadMissingLyrics": "Lae alla puuduolev lüürika",
@@ -135,5 +135,7 @@
    "TaskMoveTrickplayImagesDescription": "Liigutab trickplay pildid meediakogu sätete kohaselt.",
    "TaskExtractMediaSegments": "Meediasegmentide skaneerimine",
    "TaskExtractMediaSegmentsDescription": "Eraldab või võtab meediasegmendid MediaSegment'i lubavatest pluginatest.",
-    "TaskMoveTrickplayImages": "Migreeri trickplay piltide asukoht"
+    "TaskMoveTrickplayImages": "Muuda trickplay piltide asukoht",
+    "CleanupUserDataTask": "Kasutajaandmete puhastamise ülesanne",
+    "CleanupUserDataTaskDescription": "Puhastab kõik kasutajaandmed (vaatamise olek, lemmikute olek jne) meediast, mis pole enam vähemalt 90 päeva saadaval olnud."
 }
--- a/Emby.Server.Implementations/Localization/Core/fi.json
+++ b/Emby.Server.Implementations/Localization/Core/fi.json
@@ -69,7 +69,7 @@
    "TvShows": "Sarjat",
    "Sync": "Synkronointi",
    "SubtitleDownloadFailureFromForItem": "Tekstityksen lataus lähteestä \"{0}\" kohteelle \"{1}\" epäonnistui",
-    "StartupEmbyServerIsLoading": "Jellyfin-palvelin latautuu. Yritä hetken kuluttua uudelleen.",
+    "StartupEmbyServerIsLoading": "Jellyfin-palvelin on latautumassa. Yritä hetken kuluttua uudelleen.",
    "Songs": "Kappaleet",
    "Shows": "Sarjat",
    "ServerNameNeedsToBeRestarted": "\"{0}\" on käynnistettävä uudelleen",
@@ -79,7 +79,7 @@
    "NotificationOptionVideoPlayback": "Videon toisto aloitettu",
    "NotificationOptionUserLockedOut": "Käyttäjä on lukittu",
    "NotificationOptionTaskFailed": "Ajoitettu tehtävä epäonnistui",
-    "NotificationOptionServerRestartRequired": "Tarvitaan palvelimen uudelleenkäynnistys",
+    "NotificationOptionServerRestartRequired": "Palvelimen uudelleenkäynnistys vaaditaan",
    "NotificationOptionPluginUpdateInstalled": "Lisäosa päivitettiin",
    "NotificationOptionPluginUninstalled": "Lisäosa poistettiin",
    "NotificationOptionPluginInstalled": "Lisäosa asennettiin",
--- a/Emby.Server.Implementations/Localization/Core/gl.json
+++ b/Emby.Server.Implementations/Localization/Core/gl.json
@@ -1,74 +1,74 @@
 {
-    "Albums": "Álbumes",
+    "Albums": "Álbums",
    "Collections": "Coleccións",
    "ChapterNameValue": "Capítulo {0}",
    "Channels": "Canles",
-    "CameraImageUploadedFrom": "Cargouse unha nova imaxe da cámara desde {0}",
+    "CameraImageUploadedFrom": "Cargouse unha nova imaxe de cámara dende {0}",
    "Books": "Libros",
    "AuthenticationSucceededWithUserName": "{0} autenticouse correctamente",
    "Artists": "Artistas",
-    "Application": "Aplicativo",
-    "NotificationOptionServerRestartRequired": "Necesario un reinicio do servidor",
-    "NotificationOptionPluginUpdateInstalled": "Actualización do Plugin instalada",
+    "Application": "Aplicación",
+    "NotificationOptionServerRestartRequired": "Necesario o reinicio do servidor",
+    "NotificationOptionPluginUpdateInstalled": "Actualización do plugin instalada",
    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
    "NotificationOptionPluginInstalled": "Plugin instalado",
-    "NotificationOptionPluginError": "Fallo do Plugin",
+    "NotificationOptionPluginError": "Fallo do plugin",
    "NotificationOptionNewLibraryContent": "Novo contido engadido",
    "NotificationOptionInstallationFailed": "Fallo na instalación",
-    "NotificationOptionCameraImageUploaded": "Imaxe da cámara subida",
-    "NotificationOptionAudioPlaybackStopped": "Reproducción de audio parada",
+    "NotificationOptionCameraImageUploaded": "Imaxe da cámara cargada",
+    "NotificationOptionAudioPlaybackStopped": "Reproducción de audio detida",
    "NotificationOptionAudioPlayback": "Reproducción de audio comezada",
    "NotificationOptionApplicationUpdateInstalled": "Actualización da aplicación instalada",
    "NotificationOptionApplicationUpdateAvailable": "Actualización da aplicación dispoñible",
-    "NewVersionIsAvailable": "Unha nova versión do Servidor Jellyfin está dispoñible para descarga.",
+    "NewVersionIsAvailable": "Nova versión do Servidor Jellyfin dispoñible para descargar.",
    "NameSeasonUnknown": "Tempada descoñecida",
    "NameSeasonNumber": "Tempada {0}",
    "NameInstallFailed": "{0} instalación fallida",
-    "MusicVideos": "Vídeos Musicais",
+    "MusicVideos": "Vídeos musicais",
    "Music": "Música",
    "Movies": "Películas",
-    "MixedContent": "Contido Mixto",
-    "MessageServerConfigurationUpdated": "A configuración do servidor foi actualizada",
-    "MessageNamedServerConfigurationUpdatedWithValue": "A sección de configuración {0} do servidor foi actualizada",
-    "MessageApplicationUpdatedTo": "O servidor Jellyfin foi actualizado a {0}",
-    "MessageApplicationUpdated": "O servidor Jellyfin foi actualizado",
+    "MixedContent": "Contido mixto",
+    "MessageServerConfigurationUpdated": "Actualizouse a configuración do servidor",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Actualizouse a sección de configuración {0} do servidor",
+    "MessageApplicationUpdatedTo": "O servidor Jellyfin actualizouse a {0}",
+    "MessageApplicationUpdated": "O servidor Jellyfin actualizouse",
    "Latest": "Último",
-    "LabelRunningTimeValue": "Tempo de execución: {0}",
+    "LabelRunningTimeValue": "Tempo en execución: {0}",
    "LabelIpAddressValue": "Enderezo IP: {0}",
-    "ItemRemovedWithName": "{0} foi eliminado da biblioteca",
-    "ItemAddedWithName": "{0} foi engadido a biblioteca",
+    "ItemRemovedWithName": "{0} eliminouse da biblioteca",
+    "ItemAddedWithName": "{0} engadiuse á biblioteca",
    "Inherit": "Herdar",
    "HomeVideos": "Videos caseiros",
-    "HeaderRecordingGroups": "Grupos de Grabación",
+    "HeaderRecordingGroups": "Grupos de grabación",
    "HeaderNextUp": "De seguido",
    "HeaderLiveTV": "TV en directo",
-    "HeaderFavoriteSongs": "Cancións Favoritas",
-    "HeaderFavoriteShows": "Series de TV Favoritas",
-    "HeaderFavoriteEpisodes": "Episodios Favoritos",
-    "HeaderFavoriteArtists": "Artistas Favoritos",
-    "HeaderFavoriteAlbums": "Álbunes Favoritos",
+    "HeaderFavoriteSongs": "Cancións favoritas",
+    "HeaderFavoriteShows": "Series de TV favoritas",
+    "HeaderFavoriteEpisodes": "Episodios favoritos",
+    "HeaderFavoriteArtists": "Artistas favoritos",
+    "HeaderFavoriteAlbums": "Álbums favoritos",
    "HeaderContinueWatching": "Seguir vendo",
-    "HeaderAlbumArtists": "Artistas do Album",
+    "HeaderAlbumArtists": "Artistas do álbum",
    "Genres": "Xéneros",
    "Forced": "Forzado",
    "Folders": "Cartafoles",
    "Favorites": "Favoritos",
-    "FailedLoginAttemptWithUserName": "Intento de incio de sesión fallido {0}",
+    "FailedLoginAttemptWithUserName": "Fallo de intento de inicio de sesión dende {0}",
    "DeviceOnlineWithName": "{0} conectouse",
    "DeviceOfflineWithName": "{0} desconectouse",
    "Default": "Por defecto",
    "AppDeviceValues": "Aplicación: {0}, Dispositivo: {1}",
-    "TaskCleanLogs": "Limpar Carpeta de Rexistros",
-    "TaskCleanActivityLog": "Limpar Rexistro de Actividade",
-    "TasksChannelsCategory": "Canáis de Internet",
-    "TaskUpdatePlugins": "Actualizar Plugins",
+    "TaskCleanLogs": "Limpar directorio de rexistros",
+    "TaskCleanActivityLog": "Limpar rexistro de actividade",
+    "TasksChannelsCategory": "Canles da Internet",
+    "TaskUpdatePlugins": "Actualizar plugins",
    "User": "Usuario",
    "Undefined": "Sen definir",
    "TvShows": "Programas de TV",
    "System": "Sistema",
    "Sync": "Sincronizar",
    "SubtitleDownloadFailureFromForItem": "Fallou a descarga de subtítulos para {1} dende {0}",
-    "StartupEmbyServerIsLoading": "O Servidor Jellyfin está cargando. Por favor, reinténteo en breve.",
+    "StartupEmbyServerIsLoading": "O servidor Jellyfin está cargando. Por favor, ténteo axiña outra vez.",
    "Songs": "Cancións",
    "Shows": "Programas",
    "ServerNameNeedsToBeRestarted": "{0} precisa ser reiniciado",
@@ -85,56 +85,57 @@
    "UserDeletedWithName": "O usuario {0} foi borrado",
    "UserCreatedWithName": "O usuario {0} foi creado",
    "Plugin": "Plugin",
-    "NotificationOptionVideoPlaybackStopped": "Reproducción de vídeo parada",
+    "NotificationOptionVideoPlaybackStopped": "Reproducción de vídeo detida",
    "NotificationOptionVideoPlayback": "Reproducción de vídeo iniciada",
    "NotificationOptionUserLockedOut": "Usuario bloqueado",
    "NotificationOptionTaskFailed": "Falla na tarefa axendada",
-    "TaskCleanTranscodeDescription": "Borra os arquivos de transcode anteriores a un día.",
-    "TaskCleanTranscode": "Limpar Directorio de Transcode",
+    "TaskCleanTranscodeDescription": "Borra os ficheiros de transcodificación de hai más dun día.",
+    "TaskCleanTranscode": "Limpar o directorio de transcodificación",
    "UserStoppedPlayingItemWithValues": "{0} rematou de reproducir {1} en {2}",
-    "UserStartedPlayingItemWithValues": "{0} está reproducindo {1} en {2}",
-    "TaskDownloadMissingSubtitlesDescription": "Busca en internet por subtítulos que faltan baseado na configuración de metadatos.",
+    "UserStartedPlayingItemWithValues": "{0} está a reproducir {1} en {2}",
+    "TaskDownloadMissingSubtitlesDescription": "Procura na internet os subtítulos que faltan segundo a configuración de metadatos.",
    "TaskDownloadMissingSubtitles": "Descargar subtítulos que faltan",
-    "TaskRefreshChannelsDescription": "Refresca a información do canle de internet.",
-    "TaskRefreshChannels": "Refrescar Canles",
-    "TaskUpdatePluginsDescription": "Descarga e instala actualizacións para plugins que están configurados para actualizarse automáticamente.",
-    "TaskRefreshPeopleDescription": "Actualiza os metadatos dos actores e directores na túa libraría multimedia.",
-    "TaskRefreshPeople": "Refrescar Persoas",
-    "TaskCleanLogsDescription": "Borra arquivos de rexistro que son mais antigos que {0} días.",
-    "TaskRefreshLibraryDescription": "Escanea a tua libraría multimedia buscando novos arquivos e refrescando os metadatos.",
-    "TaskRefreshLibrary": "Escanear Libraría Multimedia",
-    "TaskRefreshChapterImagesDescription": "Crea previsualizacións para videos que teñen capítulos.",
-    "TaskRefreshChapterImages": "Extraer Imaxes dos Capítulos",
+    "TaskRefreshChannelsDescription": "Refresca a información da canle de internet.",
+    "TaskRefreshChannels": "Refrescar canles",
+    "TaskUpdatePluginsDescription": "Descarga e instala actualizacións dos plugins configurados para actualizarse automáticamente.",
+    "TaskRefreshPeopleDescription": "Actualiza os metadatos dos actores e directores na túa biblioteca de medios.",
+    "TaskRefreshPeople": "Refrescar persoas",
+    "TaskCleanLogsDescription": "Borra ficheiros de rexistro con máis de {0} días de antigüidade.",
+    "TaskRefreshLibraryDescription": "Escanea a túa biblioteca de medios á procura de novos ficheiros e refresca os metadatos.",
+    "TaskRefreshLibrary": "Escanear a biblioteca de medios",
+    "TaskRefreshChapterImagesDescription": "Crea miniaturas dos vídeos que teñen capítulos.",
+    "TaskRefreshChapterImages": "Extraer imaxes dos capítulos",
    "TaskCleanCacheDescription": "Borra ficheiros da caché que xa non son necesarios para o sistema.",
-    "TaskCleanCache": "Limpa Directorio de Caché",
-    "TaskCleanActivityLogDescription": "Borra as entradas no rexistro de actividade anteriores á data configurada.",
+    "TaskCleanCache": "Limpar directorio de caché",
+    "TaskCleanActivityLogDescription": "Borra do rexistro de actividade as entradas anteriores á data configurada.",
    "TasksApplicationCategory": "Aplicación",
    "ValueSpecialEpisodeName": "Especial - {0}",
-    "ValueHasBeenAddedToLibrary": "{0} foi engadido a túa libraría multimedia",
-    "TasksLibraryCategory": "Libraría",
+    "ValueHasBeenAddedToLibrary": "{0} engadiuse á túa biblioteca de medios",
+    "TasksLibraryCategory": "Biblioteca",
    "TasksMaintenanceCategory": "Mantemento",
    "VersionNumber": "Versión {0}",
    "UserPolicyUpdatedWithName": "A política de usuario foi actualizada para {0}",
    "UserPasswordChangedWithName": "Cambiouse o contrasinal para o usuario {0}",
    "UserOnlineFromDevice": "{0} está en liña desde {1}",
-    "UserOfflineFromDevice": "{0} desconectouse desde {1}",
-    "TaskOptimizeDatabaseDescription": "Compacta e libera o espazo libre da base de datos. Executar esta tarefa logo de realizar mudanzas que impliquen modificacións da base de datos ou despois de escanear a biblioteca pode traer mellorías de desempeño.",
+    "UserOfflineFromDevice": "{0} desconectouse dende {1}",
+    "TaskOptimizeDatabaseDescription": "Compacta e libera espazo na base de datos. Executar esta tarefa logo de facer cambios que muden a base de datos ou despois de escanear a biblioteca pode mellorar o rendemento.",
    "TaskOptimizeDatabase": "Optimizar base de datos",
-    "TaskKeyframeExtractorDescription": "Extrae fragmentos do vídeo para crear listas de reprodución HLS máis precisas. Podería levarlle bastante tempo.",
+    "TaskKeyframeExtractorDescription": "Extrae fotogramas clave dos vídeos para crear listas de reprodución HLS máis precisas. Podería levar moito tempo.",
    "External": "Externo",
    "HearingImpaired": "Problemas de audición",
-    "TaskKeyframeExtractor": "Extractor de fragmentos",
-    "TaskAudioNormalization": "Normalización do audio",
-    "TaskRefreshTrickplayImagesDescription": "Crea vistas previas de reprodución con truco para vídeos en bibliotecas activadas.",
+    "TaskKeyframeExtractor": "Extractor de fotogramas clave",
+    "TaskAudioNormalization": "Normalización de volume",
+    "TaskRefreshTrickplayImagesDescription": "Crea miniaturas de previsualización para os vídeos nas bibliotecas habilitadas.",
    "TaskDownloadMissingLyrics": "Descargar letras que faltan",
-    "TaskDownloadMissingLyricsDescription": "Descargas de letras das cancións",
+    "TaskDownloadMissingLyricsDescription": "Descarga as letras das cancións",
    "TaskCleanCollectionsAndPlaylists": "Limpar coleccións e listas de reprodución",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Elimina elementos de coleccións e listas de reprodución que xa non existen.",
-    "TaskExtractMediaSegmentsDescription": "Extrae ou obtén segmentos multimedia de complementos habilitados para o Segmento de medios.",
-    "TaskExtractMediaSegments": "Escaneo de segmentos multimedia",
-    "TaskMoveTrickplayImages": "Migrar a localización da imaxe de Trickplay",
-    "TaskMoveTrickplayImagesDescription": "Move os ficheiros de reprodución con trickplay existentes segundo a configuración da biblioteca.",
-    "TaskRefreshTrickplayImages": "Xerar imaxes de Trickplay",
-    "TaskAudioNormalizationDescription": "Analiza ficheiros para obter datos de normalización de audio.",
-    "CleanupUserDataTask": "Tarefa de limpeza de datos do usuario"
+    "TaskCleanCollectionsAndPlaylistsDescription": "Quita ítems que xa non existen das coleccións e listas de reprodución.",
+    "TaskExtractMediaSegmentsDescription": "Procura segmentos de medios cos plugins habilitados.",
+    "TaskExtractMediaSegments": "Escaneo de segmentos de medios",
+    "TaskMoveTrickplayImages": "Migrar as miniaturas de previsualización a outra ubicación",
+    "TaskMoveTrickplayImagesDescription": "Move as miniaturas de previsualización segundo a configuración da biblioteca.",
+    "TaskRefreshTrickplayImages": "Xerar miniaturas de previsualización",
+    "TaskAudioNormalizationDescription": "Escanea ficheiros á procura de datos de normalización de volume.",
+    "CleanupUserDataTask": "Tarefa de limpeza de datos dos usuarios",
+    "CleanupUserDataTaskDescription": "Limpa todos os datos do usuario (estado de visualización, de favorito etc.) dos medios ausentes polo menos 90 días."
 }
--- a/Emby.Server.Implementations/Localization/Core/gsw.json
+++ b/Emby.Server.Implementations/Localization/Core/gsw.json
@@ -12,10 +12,10 @@
    "DeviceOfflineWithName": "{0} wurde getrennt",
    "DeviceOnlineWithName": "{0} ist verbunden",
    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
-    "Favorites": "Favoriten",
+    "Favorites": "Favorite",
    "Folders": "Ordner",
    "Genres": "Genre",
-    "HeaderAlbumArtists": "Album-Künstler",
+    "HeaderAlbumArtists": "Album-Künschtler",
    "HeaderContinueWatching": "weiter schauen",
    "HeaderFavoriteAlbums": "Lieblingsalben",
    "HeaderFavoriteArtists": "Lieblings-Künstler",
--- a/Emby.Server.Implementations/Localization/Core/hr.json
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -125,8 +125,8 @@
    "TaskKeyframeExtractor": "Izvoditelj ključnog okvira",
    "TaskOptimizeDatabaseDescription": "Sažima bazu podataka i uklanja prazan prostor. Pokretanje ovog zadatka, može poboljšati performanse nakon provođenja indeksiranja biblioteke ili provođenja drugih promjena koje utječu na bazu podataka.",
    "HearingImpaired": "Oštećen sluh",
-    "TaskRefreshTrickplayImages": "Generiraj Trickplay Slike",
-    "TaskRefreshTrickplayImagesDescription": "Kreira trickplay pretpreglede za videe u omogućenim knjižnicama.",
+    "TaskRefreshTrickplayImages": "Generiraj slike brzog pregledavanja",
+    "TaskRefreshTrickplayImagesDescription": "Stvara preglede brzog pregledavanja za videa u aktiviranim bibliotekama.",
    "TaskAudioNormalization": "Normalizacija zvuka",
    "TaskAudioNormalizationDescription": "Skenira datoteke u potrazi za podacima o normalizaciji zvuka.",
    "TaskCleanCollectionsAndPlaylistsDescription": "Uklanja stavke iz zbirki i popisa za reprodukciju koje više ne postoje.",
@@ -135,6 +135,8 @@
    "TaskDownloadMissingLyrics": "Preuzmi tekstove koji nedostaju",
    "TaskDownloadMissingLyricsDescription": "Preuzmi tekstove pjesama",
    "TaskExtractMediaSegmentsDescription": "Izvlači ili pribavlja dijelove medija iz omogućenih media pluginova.",
-    "TaskMoveTrickplayImages": "Preseli lokaciju Trickplay slika",
-    "TaskMoveTrickplayImagesDescription": "Preseli lokaciju Trickplay slika prema postavkama zbirke."
+    "TaskMoveTrickplayImages": "Premjesti mjesto slika brzog pregledavanja",
+    "TaskMoveTrickplayImagesDescription": "Premješta postojeće datoteke brzog pregledavanja prema postavkama biblioteke.",
+    "CleanupUserDataTask": "Zadatak čišćenja korisničkih podataka",
+    "CleanupUserDataTaskDescription": "Briše sve korisničke podatke (stanje gledanja, status favorita itd.) s medija koji više nisu prisutni najmanje 90 dana."
 }
--- a/Emby.Server.Implementations/Localization/Core/ht.json
+++ b/Emby.Server.Implementations/Localization/Core/ht.json
@@ -1,3 +1,62 @@
 {
-    "Books": "liv"
+    "Books": "Liv",
+    "TasksLibraryCategory": "Libreri",
+    "Albums": "Albòm yo",
+    "Artists": "Atis yo",
+    "Application": "Aplikasyon",
+    "Channels": "Kanal yo",
+    "ChapterNameValue": "Chapit {0}",
+    "Default": "Defo",
+    "DeviceOnlineWithName": "{0} konekte",
+    "DeviceOfflineWithName": "{0} dekonekte",
+    "External": "Extèn",
+    "Collections": "Koleksyon yo",
+    "Favorites": "Pi Renmen",
+    "Folders": "Dosye",
+    "Genres": "Jan yo",
+    "Forced": "Fòse",
+    "HeaderAlbumArtists": "Albòm Atis",
+    "HeaderContinueWatching": "Kontinye Kade",
+    "HeaderFavoriteAlbums": "Albòm Pi Renmen",
+    "HeaderFavoriteArtists": "Atis Pi Renmen",
+    "HeaderFavoriteEpisodes": "Epizòd Pi Renmen",
+    "HeaderFavoriteShows": "Emisyon Pi Renmen",
+    "HeaderFavoriteSongs": "Mizik Pi Renmen",
+    "HeaderLiveTV": "Televizyon an Direk",
+    "HeaderNextUp": "Pwochen an",
+    "HomeVideos": "Videyo Lakay",
+    "Latest": "Pi Resan",
+    "MessageApplicationUpdated": "Sèvè Jellyfin met a jou",
+    "MessageApplicationUpdatedTo": "Sèvè Jellyfin met a jou sou {0}",
+    "Movies": "Fim",
+    "MixedContent": "Kontni Melanje",
+    "Music": "Mizik",
+    "MusicVideos": "Videyo Mizik",
+    "NameInstallFailed": "{0} enstalasyon fe fayit",
+    "NameSeasonNumber": "Sezon {0}",
+    "NameSeasonUnknown": "Sezon Enkoni",
+    "NotificationOptionCameraImageUploaded": "Imaj Kamera telechaje",
+    "NotificationOptionInstallationFailed": "Enstalasyon echwe",
+    "Photos": "Foto",
+    "PluginInstalledWithName": "{0} te enstale",
+    "PluginUninstalledWithName": "{0} te dezenstale",
+    "PluginUpdatedWithName": "{0} te mi a jou",
+    "ScheduledTaskFailedWithName": "{0} echwe",
+    "ScheduledTaskStartedWithName": "{0} komanse",
+    "Songs": "Mizik yo",
+    "Shows": "Emisyon yo",
+    "System": "Sistèm",
+    "TvShows": "Emisyon Tele",
+    "User": "Itilizatè",
+    "UserCreatedWithName": "Itilizatè {0} kreye",
+    "UserDeletedWithName": "Itilizatè {0} a efase",
+    "UserDownloadingItemWithValues": "{0} ap telechaje {1}",
+    "UserOfflineFromDevice": "{0} dekonekte de {1}",
+    "UserStartedPlayingItemWithValues": "{0} ap jwe {1} sou {2}",
+    "UserStoppedPlayingItemWithValues": "{0} fin jwe {1} sou {2}",
+    "UserPasswordChangedWithName": "Modpas la chanje pou Itilizatè {0}",
+    "ValueSpecialEpisodeName": "Spesyal - {0}",
+    "VersionNumber": "Vesyon {0}",
+    "TasksApplicationCategory": "Aplikasyon",
+    "TasksMaintenanceCategory": "Antretyen"
 }
--- a/Emby.Server.Implementations/Localization/Core/mn.json
+++ b/Emby.Server.Implementations/Localization/Core/mn.json
@@ -1,16 +1,16 @@
 {
-    "Books": "Номууд",
+    "Books": "Номнууд",
    "HeaderNextUp": "Дараа нь",
    "HeaderContinueWatching": "Үргэлжлүүлэн үзэх",
    "Songs": "Дуунууд",
-    "Playlists": "Тоглуулах жагсаалт",
-    "Movies": "Кино",
+    "Playlists": "Playlist-ууд",
+    "Movies": "Кинонууд",
    "Latest": "Сүүлийн үеийн",
    "Genres": "Төрлүүд",
    "Favorites": "Дуртай",
-    "Collections": "Багц",
+    "Collections": "Цуглуулгууд",
    "Artists": "Уран бүтээлчид",
-    "Albums": "Цомгууд",
+    "Albums": "Дуут цомгууд",
    "TaskExtractMediaSegments": "Медиа сегмент шалга",
    "TaskExtractMediaSegmentsDescription": "MediaSegment идэвхжүүлсэн залгаасуудаас медиа сегментүүдийг задлах эсвэл олж авах.",
    "TaskMoveTrickplayImages": "Трикплэй зургуудын байршлыг шилжүүлэх",
@@ -63,11 +63,11 @@
    "CameraImageUploadedFrom": "{0}-с шинэ зураг байршуулагдлаа",
    "Channels": "Сувгууд",
    "ChapterNameValue": "{0}-р бүлэг",
-    "Default": "Өгөгдмөл",
+    "Default": "Анхдагч",
    "DeviceOfflineWithName": "{0}-н холболт саллаа",
    "DeviceOnlineWithName": "{0} холбогдлоо",
    "FailedLoginAttemptWithUserName": "{0}-н нэвтрэх оролдлого амжилтгүй",
-    "Folders": "Хавтаснууд",
+    "Folders": "Хавтасууд",
    "Forced": "Хүчээр",
    "HeaderAlbumArtists": "Цомгийн уран бүтээлчид",
    "HeaderFavoriteAlbums": "Дуртай цомгууд",
@@ -84,8 +84,8 @@
    "MessageApplicationUpdatedTo": "Jellyfin Server {0} болж шинэчлэгдлээ",
    "MessageServerConfigurationUpdated": "Server-н тохиргоо шинэчлэгдлээ",
    "MixedContent": "Холимог агуулга",
-    "Music": "Дуу",
-    "MusicVideos": "Дууны клип",
+    "Music": "Хөгжим",
+    "MusicVideos": "Дууны клипүүд",
    "NameInstallFailed": "{0} суулгахад алдаа гарлаа",
    "NameSeasonNumber": "{0}-р улирал",
    "NameSeasonUnknown": "Улирал олдсонгүй",
@@ -101,14 +101,14 @@
    "NotificationOptionUserLockedOut": "Хэрэглэгчийг түгжив",
    "NotificationOptionVideoPlayback": "Бичлэгийг тоглуулж эхлэв",
    "Photos": "Зургууд",
-    "Plugin": "Plugin",
+    "Plugin": "Плагин",
    "PluginInstalledWithName": "{0}-г суулгалаа",
    "PluginUninstalledWithName": "{0}-г устгалаа",
    "PluginUpdatedWithName": "{0}-г шинэчиллээ",
    "ProviderValue": "Нийлүүлэгч: {0}",
    "ScheduledTaskStartedWithName": "{0}-г эхлүүлэв",
    "ServerNameNeedsToBeRestarted": "{0}-г дахин асаана уу",
-    "Shows": "Нэвтрүүлгүүд",
+    "Shows": "Шоу",
    "Sync": "Дахин",
    "System": "Систем",
    "TvShows": "ТВ нэвтрүүлгүүд",
@@ -122,7 +122,7 @@
    "UserPolicyUpdatedWithName": "Хэрэглэгчийн журмыг {0}-д зориулан шинэчиллээ",
    "UserStartedPlayingItemWithValues": "{0}-г {2} дээр {1}-г тоглуулж байна",
    "UserStoppedPlayingItemWithValues": "{0}-г {2} дээр {1}-г тоглуулж дуусгалаа",
-    "ValueSpecialEpisodeName": "Тусгай - {0}",
+    "ValueSpecialEpisodeName": "Онцгой - {0}",
    "VersionNumber": "Хувилбар {0}",
    "TasksMaintenanceCategory": "Засвар",
    "TasksLibraryCategory": "Сан",
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -136,5 +136,7 @@
    "TaskExtractMediaSegments": "Skann mediasegment",
    "TaskMoveTrickplayImages": "Migrer bildeplassering for Trickplay",
    "TaskMoveTrickplayImagesDescription": "Flytter eksisterende Trickplay-filer i henhold til biblioteksinstillingene.",
-    "TaskExtractMediaSegmentsDescription": "Trekker ut eller henter mediasegmenter fra plugins som støtter MediaSegment."
+    "TaskExtractMediaSegmentsDescription": "Trekker ut eller henter mediasegmenter fra plugins som støtter MediaSegment.",
+    "CleanupUserDataTaskDescription": "Sletter all brukerdata (avspillings-status, favoritter osv.) fra innhold som har vært utilgjengelig i minst 90 dager.",
+    "CleanupUserDataTask": "Oppgave for opprydding av brukerdata"
 }
--- a/Emby.Server.Implementations/Localization/Core/pr.json
+++ b/Emby.Server.Implementations/Localization/Core/pr.json
@@ -41,5 +41,77 @@
    "MixedContent": "Jumbled loot",
    "Music": "Tunes",
    "NameInstallFailed": "Ye couldn't bring {0} aboard yer ship",
-    "MessageApplicationUpdatedTo": "Yer Map of the Seas has been scribbled with {0}"
+    "MessageApplicationUpdatedTo": "Yer Map of the Seas has been scribbled with {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Yer Map Drawer has been rescribbled to {0}",
+    "MessageServerConfigurationUpdated": "Yer Map drawer has been rescribbled",
+    "Inherit": "Carry on what be passed along",
+    "Latest": "Newfangled",
+    "Movies": "Moving pictures",
+    "NewVersionIsAvailable": "A fresh build o’ Jellyfin Server be waitin’ fer ye to fetch.",
+    "NotificationOptionPluginInstalled": "Plugin nailed down",
+    "NotificationOptionVideoPlayback": "Video playback be underway",
+    "ScheduledTaskFailedWithName": "{0} ran aground",
+    "StartupEmbyServerIsLoading": "Jellyfin Server be preparin’ the ship. Try yer luck again soon.",
+    "UserOfflineFromDevice": "{0} severed ties with {1}",
+    "UserDownloadingItemWithValues": "{0} be haulin’ in {1}",
+    "UserStartedPlayingItemWithValues": "{0} be playin’ {1} aboard {2}",
+    "ValueHasBeenAddedToLibrary": "{0} be stashed in yer treasure trove",
+    "TaskCleanCacheDescription": "Wipes away cache cargo no longer called fer.",
+    "TaskCleanLogsDescription": "Clears the logbook o’ entries older than {0} days.",
+    "TaskRefreshPeopleDescription": "Refreshes the charts fer actors an’ directors in yer Treasure Trove.",
+    "UserLockedOutWithName": "Matey {0} be denied boarding",
+    "TaskAudioNormalization": "Steadyin’ the shanties",
+    "TaskAudioNormalizationDescription": "Scans files fer shanty steadiyin’ data.",
+    "HeaderRecordingGroups": "Loggin' Groups",
+    "MusicVideos": "Shanty films",
+    "Playlists": "Lists o’ plunder",
+    "Plugin": "Extra sail",
+    "NotificationOptionVideoPlaybackStopped": "Video playback dropped anchor",
+    "NameSeasonNumber": "Saga {0}",
+    "NameSeasonUnknown": "Saga be Lost",
+    "NotificationOptionApplicationUpdateAvailable": "A fresh build awaits",
+    "NotificationOptionApplicationUpdateInstalled": "App upgrade be aboard",
+    "NotificationOptionAudioPlayback": "Audio playback be rollin",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback dropped anchor",
+    "NotificationOptionCameraImageUploaded": "Spyglass shot be hoisted",
+    "NotificationOptionInstallationFailed": "Install be wrecked",
+    "NotificationOptionNewLibraryContent": "Fresh plunder ready to claim",
+    "NotificationOptionPluginError": "Plugin ran aground",
+    "NotificationOptionPluginUninstalled": "Plugin cast overboard",
+    "NotificationOptionPluginUpdateInstalled": "Plugin patched ‘n ready",
+    "NotificationOptionServerRestartRequired": "Server be due fer a restart",
+    "NotificationOptionTaskFailed": "Set chore went overboard",
+    "TaskRefreshLibraryDescription": "Searches the Treasure Trove fer new plunder ‘n updates the charts.",
+    "PluginInstalledWithName": "{0} nailed down",
+    "TaskCleanLogs": "Swab the Log Hold",
+    "TaskRefreshPeople": "Freshen the Mateys",
+    "PluginUninstalledWithName": "{0} sent t’ Davy Jones",
+    "PluginUpdatedWithName": "{0} patched ‘n ready",
+    "ProviderValue": "Supplier o’ goods: {0}",
+    "ScheduledTaskStartedWithName": "{0} set sail",
+    "ServerNameNeedsToBeRestarted": "{0} be cravin’ a restart",
+    "Shows": "Sagas",
+    "SubtitleDownloadFailureFromForItem": "Subtitles be sunk fetchin’ from {0} fer {1}",
+    "Sync": "Match the tides",
+    "System": "The ship’s works",
+    "TvShows": "TV Sagas",
+    "Undefined": "Uncharted",
+    "User": "Matey",
+    "UserCreatedWithName": "Matey {0} joined the crew",
+    "UserDeletedWithName": "Matey {0} cast overboard",
+    "UserOnlineFromDevice": "{0} be aboard ship from {1}",
+    "UserPasswordChangedWithName": "New passphrase set fer Matey {0}",
+    "UserPolicyUpdatedWithName": "Ship rules be changed fer {0}",
+    "UserStoppedPlayingItemWithValues": "{0} be done playin’ {1} on {2",
+    "ValueSpecialEpisodeName": "Special Tale – {0}",
+    "VersionNumber": "Edition {0}",
+    "TasksMaintenanceCategory": "Hull patchin’",
+    "TasksLibraryCategory": "Treasure Trove",
+    "TasksApplicationCategory": "Ship",
+    "TaskCleanActivityLog": "Clear the Ship’s Log",
+    "TaskCleanActivityLogDescription": "Purges ship’s logs older than the chosen time.",
+    "TaskCleanCache": "Sweep the Cache Chest",
+    "TaskRefreshChapterImages": "Claim chapter portraits",
+    "TaskRefreshChapterImagesDescription": "Paints wee portraits fer videos that own chapters.",
+    "TaskRefreshLibrary": "Scan the Treasure Trove"
 }
--- a/Emby.Server.Implementations/Localization/Core/ru.json
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -70,7 +70,7 @@
    "ScheduledTaskFailedWithName": "{0} - неудачна",
    "ScheduledTaskStartedWithName": "{0} - запущена",
    "ServerNameNeedsToBeRestarted": "Необходим перезапуск {0}",
-    "Shows": "Телешоу",
+    "Shows": "Сериалы",
    "Songs": "Композиции",
    "StartupEmbyServerIsLoading": "Jellyfin Server загружается. Повторите попытку в ближайшее время.",
    "SubtitleDownloadFailureForItem": "Субтитры к {0} не удалось загрузить",
--- a/Emby.Server.Implementations/Localization/Core/sq.json
+++ b/Emby.Server.Implementations/Localization/Core/sq.json
@@ -135,5 +135,7 @@
    "TaskCleanCollectionsAndPlaylists": "Pastron koleksionet dhe listat e këngëve",
    "TaskCleanCollectionsAndPlaylistsDescription": "Heq elementet nga koleksionet dhe listat e këngëve që nuk ekzistojnë më.",
    "TaskAudioNormalization": "Normalizimi i audios",
-    "TaskAudioNormalizationDescription": "Skannon skedarët për të dhëna të normalizimit të audios."
+    "TaskAudioNormalizationDescription": "Skannon skedarët për të dhëna të normalizimit të audios.",
+    "CleanupUserDataTaskDescription": "Pastron të gjitha të dhënat e përdorueseve (gjendja e shikimit, statusi i të preferuarave etj.) nga mediat që nuk janë më të pranishme për të paktën 90 ditë.",
+    "CleanupUserDataTask": "Veprim për pastrimin të dhënave të përdorueseve"
 }
--- a/Emby.Server.Implementations/Localization/Core/sr.json
+++ b/Emby.Server.Implementations/Localization/Core/sr.json
@@ -126,5 +126,16 @@
    "HearingImpaired": "ослабљен слух",
    "TaskAudioNormalization": "Нормализација звука",
    "TaskCleanCollectionsAndPlaylists": "Очистите колекције и плејлисте",
-    "TaskAudioNormalizationDescription": "Скенира датотеке за податке о нормализацији звука."
+    "TaskAudioNormalizationDescription": "Скенира датотеке за податке о нормализацији звука.",
+    "TaskRefreshTrickplayImages": "Направи сличице за визуелно премотавање",
+    "TaskRefreshTrickplayImagesDescription": "Прављење сличица које помажу код визуелног премотавања видео-снимака.",
+    "TaskDownloadMissingLyrics": "Преузми стихове који недостају",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Уклања ставке које више не постоје из колекција и плејлиста.",
+    "TaskExtractMediaSegments": "Скенирај сегменте медија",
+    "TaskExtractMediaSegmentsDescription": "Извлачи или добавља сегменте медија у додацима који раде са MediaSegment-ом.",
+    "TaskMoveTrickplayImagesDescription": "Премешта постојеће сличице за визуелно премотавање сходно подешавањима библиотеке.",
+    "CleanupUserDataTask": "Задатак чишћења корисничких података",
+    "CleanupUserDataTaskDescription": "Чисти све корисничке податке (напредак гледања, ознаке за омиљено...) медија који нису доступни 90 дана или дуже.",
+    "TaskMoveTrickplayImages": "Промени локацију сличица за визуелно премотавање",
+    "TaskDownloadMissingLyricsDescription": "Преузми стихове песама"
 }
--- a/Emby.Server.Implementations/Localization/Core/te.json
+++ b/Emby.Server.Implementations/Localization/Core/te.json
@@ -59,5 +59,6 @@
    "NotificationOptionAudioPlayback": "ఆడియో ప్లే కావడం మొదలైంది",
    "NotificationOptionCameraImageUploaded": "కెమెరా చిత్రాన్ని అప్లోడ్ చేశారు",
    "NotificationOptionInstallationFailed": "ఇన్స్టాలేషన్ విఫలమైంది",
-    "NotificationOptionServerRestartRequired": "సర్వర్ రీస్టార్ట్ అవసరం"
+    "NotificationOptionServerRestartRequired": "సర్వర్ రీస్టార్ట్ అవసరం",
+    "Inherit": "సంక్రమించు"
 }
--- a/Emby.Server.Implementations/Localization/Core/ur.json
+++ b/Emby.Server.Implementations/Localization/Core/ur.json
@@ -1,3 +1,16 @@
 {
-    "Books": "کتابیں"
+    "Books": "کتابیں",
+    "AppDeviceValues": "ایپ: {0}، ڈیوائس: {1}",
+    "Albums": "البمز",
+    "Application": "ایپلی کیشن",
+    "Artists": "فنکار",
+    "AuthenticationSucceededWithUserName": "{0} کی کامیابی سے تصدیق ہو چکی ہے",
+    "CameraImageUploadedFrom": "ایک نئی کیمرے کی تصویر {0} سے اپ لوڈ کی گئی ہے",
+    "Channels": "چینلز",
+    "ChapterNameValue": "باب {0}",
+    "Collections": "مجموعے",
+    "Default": "ڈیفالٹ",
+    "DeviceOfflineWithName": "{0} نے رابطہ منقطع کر دیا ہے",
+    "DeviceOnlineWithName": "{0} منسلک ہے",
+    "External": "بیرونی"
 }
--- a/Emby.Server.Implementations/Localization/Core/ur_PK.json
+++ b/Emby.Server.Implementations/Localization/Core/ur_PK.json
@@ -123,5 +123,9 @@
    "TaskCleanActivityLogDescription": "تشکیل شدہ عمر سے زیادہ پرانی سرگرمی لاگ اندراجات کو حذف کرتا ہے۔",
    "External": "بیرونی",
    "HearingImpaired": "قوت سماعت سے محروم",
-    "TaskCleanActivityLog": "سرگرمی لاگ کو صاف کریں"
+    "TaskCleanActivityLog": "سرگرمی لاگ کو صاف کریں",
+    "TaskDownloadMissingLyrics": "غائب بول ڈاؤن لوڈ کریں",
+    "TaskDownloadMissingLyricsDescription": "گانے کے غائب بول ڈاؤن لوڈ کریں",
+    "TaskAudioNormalization": "آڈیو نارملائزیشن",
+    "TaskAudioNormalizationDescription": "آڈیو نارملائزیشن ڈیٹا کے لیے فائلوں کو سکین کرتا ہے۔"
 }
--- a/Emby.Server.Implementations/Localization/iso6392.txt
+++ b/Emby.Server.Implementations/Localization/iso6392.txt
@@ -402,8 +402,8 @@ sog|||Sogdian|sogdien
 som||so|Somali|somali
 son|||Songhai languages|songhai, langues
 sot||st|Sotho, Southern|sotho du Sud
-spa||es-419|Spanish; Latin|espagnol; Latin
 spa||es|Spanish; Castilian|espagnol; castillan
+spa||es-419|Spanish; Latin|espagnol; Latin
 sqi|alb|sq|Albanian|albanais
 srd||sc|Sardinian|sarde
 srn|||Sranan Tongo|sranan tongo
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -314,7 +314,7 @@ namespace Emby.Server.Implementations.Playlists
                return;
            }

-            var newPriorItemIndex = newIndex > oldIndexAccessible ? newIndex : newIndex - 1 < 0 ? 0 : newIndex - 1;
+            var newPriorItemIndex = Math.Max(newIndex - 1, 0);
            var newPriorItemId = accessibleChildren[newPriorItemIndex].Item1.ItemId;
            var newPriorItemIndexOnAllChildren = children.FindIndex(c => c.Item1.ItemId.Equals(newPriorItemId));
            var adjustedNewIndex = DetermineAdjustedIndex(newPriorItemIndexOnAllChildren, newIndex);
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs
@@ -33,6 +33,8 @@ public partial class AudioNormalizationTask : IScheduledTask
    private readonly ILocalizationManager _localization;
    private readonly ILogger<AudioNormalizationTask> _logger;

+    private static readonly TimeSpan _dbSaveInterval = TimeSpan.FromMinutes(5);
+
    /// <summary>
    /// Initializes a new instance of the <see cref="AudioNormalizationTask"/> class.
    /// </summary>
@@ -82,7 +84,9 @@ public partial class AudioNormalizationTask : IScheduledTask

        foreach (var library in libraries)
        {
+            var startDbSaveInterval = Stopwatch.GetTimestamp();
            var albums = _libraryManager.GetItemList(new InternalItemsQuery { IncludeItemTypes = [BaseItemKind.MusicAlbum], Parent = library, Recursive = true });
+            var toSaveDbItems = new List<BaseItem>();

            double nextPercent = numComplete + 1;
            nextPercent /= libraries.Length;
@@ -114,14 +118,33 @@ public partial class AudioNormalizationTask : IScheduledTask
                                string.Format(CultureInfo.InvariantCulture, "-f concat -safe 0 -i \"{0}\"", tempFile),
                                OperatingSystem.IsWindows(), // Wait for process to exit on Windows before we try deleting the concat file
                                cancellationToken).ConfigureAwait(false);
+                            toSaveDbItems.Add(a);
                        }
                        finally
                        {
-                            File.Delete(tempFile);
+                            try
+                            {
+                                File.Delete(tempFile);
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.LogError(ex, "Failed to delete concat file: {FileName}.", tempFile);
+                            }
                        }
                    }
                }

+                if (Stopwatch.GetElapsedTime(startDbSaveInterval) > _dbSaveInterval)
+                {
+                    if (toSaveDbItems.Count > 1)
+                    {
+                        _itemRepository.SaveItems(toSaveDbItems, cancellationToken);
+                        toSaveDbItems.Clear();
+                    }
+
+                    startDbSaveInterval = Stopwatch.GetTimestamp();
+                }
+
                // Update sub-progress for album gain
                albumComplete++;
                double albumPercent = albumComplete;
@@ -133,7 +156,13 @@ public partial class AudioNormalizationTask : IScheduledTask
            // Update progress to start at the track gain percent calculation
            percent += nextPercent;

-            _itemRepository.SaveItems(albums, cancellationToken);
+            if (toSaveDbItems.Count > 1)
+            {
+                _itemRepository.SaveItems(toSaveDbItems, cancellationToken);
+                toSaveDbItems.Clear();
+            }
+
+            startDbSaveInterval = Stopwatch.GetTimestamp();

            // Track gain
            var tracks = _libraryManager.GetItemList(new InternalItemsQuery { MediaTypes = [MediaType.Audio], IncludeItemTypes = [BaseItemKind.Audio], Parent = library, Recursive = true });
@@ -147,6 +176,18 @@ public partial class AudioNormalizationTask : IScheduledTask
                        string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.Replace("\"", "\\\"", StringComparison.Ordinal)),
                        false,
                        cancellationToken).ConfigureAwait(false);
+                    toSaveDbItems.Add(t);
+                }
+
+                if (Stopwatch.GetElapsedTime(startDbSaveInterval) > _dbSaveInterval)
+                {
+                    if (toSaveDbItems.Count > 1)
+                    {
+                        _itemRepository.SaveItems(toSaveDbItems, cancellationToken);
+                        toSaveDbItems.Clear();
+                    }
+
+                    startDbSaveInterval = Stopwatch.GetTimestamp();
                }

                // Update sub-progress for track gain
@@ -157,7 +198,10 @@ public partial class AudioNormalizationTask : IScheduledTask
                progress.Report(100 * (percent + (trackPercent * nextPercent)));
            }

-            _itemRepository.SaveItems(tracks, cancellationToken);
+            if (toSaveDbItems.Count > 1)
+            {
+                _itemRepository.SaveItems(toSaveDbItems, cancellationToken);
+            }

            // Update progress
            numComplete++;
@@ -195,9 +239,9 @@ public partial class AudioNormalizationTask : IScheduledTask
            },
        })
        {
+            _logger.LogDebug("Starting ffmpeg with arguments: {Arguments}", args);
            try
            {
-                _logger.LogDebug("Starting ffmpeg with arguments: {Arguments}", args);
                process.Start();
            }
            catch (Exception ex)
@@ -206,16 +250,33 @@ public partial class AudioNormalizationTask : IScheduledTask
                return null;
            }

+            try
+            {
+                process.PriorityClass = ProcessPriorityClass.BelowNormal;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Error setting ffmpeg process priority");
+            }
+
            using var reader = process.StandardError;
            float? lufs = null;
+            var foundLufs = false;
            await foreach (var line in reader.ReadAllLinesAsync(cancellationToken).ConfigureAwait(false))
            {
-                Match match = LUFSRegex().Match(line);
-                if (match.Success)
+                if (foundLufs)
                {
-                    lufs = float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
-                    break;
+                    continue;
                }
+
+                Match match = LUFSRegex().Match(line);
+                if (!match.Success)
+                {
+                    continue;
+                }
+
+                lufs = float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
+                foundLufs = true;
            }

            if (lufs is null)
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs
@@ -61,7 +61,7 @@ public class OptimizeDatabaseTask : IScheduledTask, IConfigurableScheduledTask
        yield return new TaskTriggerInfo
        {
            Type = TaskTriggerInfoType.IntervalTrigger,
-            IntervalTicks = TimeSpan.FromHours(24).Ticks
+            IntervalTicks = TimeSpan.FromHours(6).Ticks
        };
    }

--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
@@ -1,10 +1,14 @@
 using System;
+using System.Buffers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Database.Implementations;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
+using Microsoft.EntityFrameworkCore;

 namespace Emby.Server.Implementations.ScheduledTasks.Tasks;

@@ -15,16 +19,19 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask
 {
    private readonly ILibraryManager _libraryManager;
    private readonly ILocalizationManager _localization;
+    private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;

    /// <summary>
    /// Initializes a new instance of the <see cref="PeopleValidationTask" /> class.
    /// </summary>
    /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
    /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-    public PeopleValidationTask(ILibraryManager libraryManager, ILocalizationManager localization)
+    /// <param name="dbContextFactory">Instance of the <see cref="IDbContextFactory{TContext}"/> interface.</param>
+    public PeopleValidationTask(ILibraryManager libraryManager, ILocalizationManager localization, IDbContextFactory<JellyfinDbContext> dbContextFactory)
    {
        _libraryManager = libraryManager;
        _localization = localization;
+        _dbContextFactory = dbContextFactory;
    }

    /// <inheritdoc />
@@ -62,8 +69,61 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask
    }

    /// <inheritdoc />
-    public Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
    {
-        return _libraryManager.ValidatePeopleAsync(progress, cancellationToken);
+        IProgress<double> subProgress = new Progress<double>((val) => progress.Report(val / 2));
+        await _libraryManager.ValidatePeopleAsync(subProgress, cancellationToken).ConfigureAwait(false);
+
+        subProgress = new Progress<double>((val) => progress.Report((val / 2) + 50));
+        var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (context.ConfigureAwait(false))
+        {
+            var dupQuery = context.Peoples
+                    .GroupBy(e => new { e.Name, e.PersonType })
+                    .Where(e => e.Count() > 1)
+                    .Select(e => e.Select(f => f.Id).ToArray());
+
+            var total = dupQuery.Count();
+
+            const int PartitionSize = 100;
+            var iterator = 0;
+            int itemCounter;
+            var buffer = ArrayPool<Guid[]>.Shared.Rent(PartitionSize)!;
+            try
+            {
+                do
+                {
+                    itemCounter = 0;
+                    await foreach (var item in dupQuery
+                        .Take(PartitionSize)
+                        .AsAsyncEnumerable()
+                        .WithCancellation(cancellationToken)
+                        .ConfigureAwait(false))
+                    {
+                        buffer[itemCounter++] = item;
+                    }
+
+                    for (int i = 0; i < itemCounter; i++)
+                    {
+                        var item = buffer[i];
+                        var reference = item[0];
+                        var dups = item[1..];
+                        await context.PeopleBaseItemMap.WhereOneOrMany(dups, e => e.PeopleId)
+                            .ExecuteUpdateAsync(e => e.SetProperty(f => f.PeopleId, reference), cancellationToken)
+                            .ConfigureAwait(false);
+                        await context.Peoples.Where(e => dups.Contains(e.Id)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+                        subProgress.Report(100f / total * ((iterator * PartitionSize) + i));
+                    }
+
+                    iterator++;
+                } while (itemCounter == PartitionSize && !cancellationToken.IsCancellationRequested);
+            }
+            finally
+            {
+                ArrayPool<Guid[]>.Shared.Return(buffer);
+            }
+
+            subProgress.Report(100);
+        }
    }
 }
--- a/Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
@@ -6,7 +6,6 @@ using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Querying;

 namespace Emby.Server.Implementations.Sorting
 {
@@ -54,7 +53,7 @@ namespace Emby.Server.Implementations.Sorting
        /// <returns>DateTime.</returns>
        private int GetValue(BaseItem x)
        {
-            return x.IsFavoriteOrLiked(User) ? 0 : 1;
+            return x.IsFavoriteOrLiked(User, userItemData: null) ? 0 : 1;
        }
    }
 }
--- a/Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
@@ -7,7 +7,6 @@ using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Querying;

 namespace Emby.Server.Implementations.Sorting
 {
@@ -55,7 +54,7 @@ namespace Emby.Server.Implementations.Sorting
        /// <returns>DateTime.</returns>
        private int GetValue(BaseItem x)
        {
-            return x.IsPlayed(User) ? 0 : 1;
+            return x.IsPlayed(User, userItemData: null) ? 0 : 1;
        }
    }
 }
--- a/Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
@@ -7,7 +7,6 @@ using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Querying;

 namespace Emby.Server.Implementations.Sorting
 {
@@ -55,7 +54,7 @@ namespace Emby.Server.Implementations.Sorting
        /// <returns>DateTime.</returns>
        private int GetValue(BaseItem x)
        {
-            return x.IsUnplayed(User) ? 0 : 1;
+            return x.IsUnplayed(User, userItemData: null) ? 0 : 1;
        }
    }
 }
--- a/Jellyfin.Api/Controllers/DisplayPreferencesController.cs
+++ b/Jellyfin.Api/Controllers/DisplayPreferencesController.cs
@@ -96,9 +96,6 @@ public class DisplayPreferencesController : BaseJellyfinApiController
            dto.CustomPrefs.TryAdd(key, value);
        }

-        // This will essentially be a noop if no changes have been made, but new prefs must be saved at least.
-        _displayPreferencesManager.SaveChanges();
-
        return dto;
    }

@@ -210,8 +207,8 @@ public class DisplayPreferencesController : BaseJellyfinApiController

        // Set all remaining custom preferences.
        _displayPreferencesManager.SetCustomItemDisplayPreferences(userId.Value, itemId, existingDisplayPreferences.Client, displayPreferences.CustomPrefs);
-        _displayPreferencesManager.SaveChanges();
-
+        _displayPreferencesManager.UpdateItemDisplayPreferences(itemPrefs);
+        _displayPreferencesManager.UpdateDisplayPreferences(existingDisplayPreferences);
        return NoContent();
    }
 }
--- a/Jellyfin.Api/Controllers/LibraryController.cs
+++ b/Jellyfin.Api/Controllers/LibraryController.cs
@@ -779,11 +779,14 @@ public class LibraryController : BaseJellyfinApiController
        var query = new InternalItemsQuery(user)
        {
            Genres = item.Genres,
+            Tags = item.Tags,
            Limit = limit,
            IncludeItemTypes = includeItemTypes.ToArray(),
            DtoOptions = dtoOptions,
            EnableTotalRecordCount = !isMovie ?? true,
            EnableGroupByMetadataKey = isMovie ?? false,
+            ExcludeItemIds = [itemId],
+            OrderBy = [(ItemSortBy.Random, SortOrder.Ascending)]
        };

        // ExcludeArtistIds
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -108,6 +108,7 @@ public class YearsController : BaseJellyfinApiController
        bool Filter(BaseItem i) => FilterItem(i, excludeItemTypes, includeItemTypes, mediaTypes);

        IReadOnlyList<BaseItem> items;
+        int totalCount = -1;
        if (parentItem.IsFolder)
        {
            var folder = (Folder)parentItem;
@@ -118,7 +119,7 @@ public class YearsController : BaseJellyfinApiController
            }
            else
            {
-                items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToArray();
+                items = recursive ? folder.GetRecursiveChildren(user, query, out totalCount) : folder.GetChildren(user, true).Where(Filter).ToArray();
            }
        }
        else
@@ -153,7 +154,7 @@ public class YearsController : BaseJellyfinApiController

        var result = new QueryResult<BaseItemDto>(
            startIndex,
-            ibnItemsArray.Count,
+            totalCount == -1 ? ibnItemsArray.Count : totalCount,
            dtos.Where(i => i is not null).ToArray());
        return result;
    }
--- a/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
+++ b/Jellyfin.Api/WebSocketListeners/SessionInfoWebSocketListener.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Data;
 using Jellyfin.Database.Implementations.Enums;
@@ -56,6 +57,21 @@ public class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnume
        return Task.FromResult(_sessionManager.Sessions);
    }

+    /// <inheritdoc />
+    protected override Task<IEnumerable<SessionInfo>> GetDataToSendForConnection(IWebSocketConnection connection)
+    {
+        // For non-admin users, filter the sessions to only include their own sessions
+        if (connection.AuthorizationInfo?.User is not null &&
+            !connection.AuthorizationInfo.IsApiKey &&
+            !connection.AuthorizationInfo.User.HasPermission(PermissionKind.IsAdministrator))
+        {
+            var userId = connection.AuthorizationInfo.User.Id;
+            return Task.FromResult(_sessionManager.Sessions.Where(s => s.UserId.Equals(userId) || s.ContainsUser(userId)));
+        }
+
+        return Task.FromResult(_sessionManager.Sessions);
+    }
+
    /// <inheritdoc />
    protected override async ValueTask DisposeAsyncCore()
    {
@@ -80,11 +96,10 @@ public class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnume
    /// <param name="message">The message.</param>
    protected override void Start(WebSocketMessageInfo message)
    {
-        if (!message.Connection.AuthorizationInfo.IsApiKey
-            && (message.Connection.AuthorizationInfo.User is null
-                || !message.Connection.AuthorizationInfo.User.HasPermission(PermissionKind.IsAdministrator)))
+        // Allow all authenticated users to subscribe to session information
+        if (message.Connection.AuthorizationInfo.User is null && !message.Connection.AuthorizationInfo.IsApiKey)
        {
-            throw new AuthenticationException("Only admin users can subscribe to session information.");
+            throw new AuthenticationException("User must be authenticated to subscribe to session Information.");
        }

        base.Start(message);
--- a/Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs
+++ b/Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs
@@ -39,7 +39,7 @@ public class BackupService : IBackupService
        ReferenceHandler = ReferenceHandler.IgnoreCycles,
    };

-    private readonly Version _backupEngineVersion = Version.Parse("0.2.0");
+    private readonly Version _backupEngineVersion = new Version(0, 2, 0);

    /// <summary>
    /// Initializes a new instance of the <see cref="BackupService"/> class.
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -75,6 +75,7 @@ public sealed class BaseItemRepository
    private static readonly IReadOnlyList<ItemValueType> _getAlbumArtistValueTypes = [ItemValueType.AlbumArtist];
    private static readonly IReadOnlyList<ItemValueType> _getStudiosValueTypes = [ItemValueType.Studios];
    private static readonly IReadOnlyList<ItemValueType> _getGenreValueTypes = [ItemValueType.Genre];
+    private static readonly IReadOnlyList<char> SearchWildcardTerms = ['%', '_', '[', ']', '^'];

    /// <summary>
    /// Initializes a new instance of the <see cref="BaseItemRepository"/> class.
@@ -99,11 +100,11 @@ public sealed class BaseItemRepository
    }

    /// <inheritdoc />
-    public void DeleteItem(Guid id)
+    public void DeleteItem(params IReadOnlyList<Guid> ids)
    {
-        if (id.IsEmpty() || id.Equals(PlaceholderId))
+        if (ids is null || ids.Count == 0 || ids.Any(f => f.Equals(PlaceholderId)))
        {
-            throw new ArgumentException("Guid can't be empty or the placeholder id.", nameof(id));
+            throw new ArgumentException("Guid can't be empty or the placeholder id.", nameof(ids));
        }

        using var context = _dbProvider.CreateDbContext();
@@ -111,13 +112,15 @@ public sealed class BaseItemRepository

        var date = (DateTime?)DateTime.UtcNow;

+        var relatedItems = ids.SelectMany(f => TraverseHirachyDown(f, context)).ToArray();
+
        // Remove any UserData entries for the placeholder item that would conflict with the UserData
        // being detached from the item being deleted. This is necessary because, during an update,
        // UserData may be reattached to a new entry, but some entries can be left behind.
        // Ensures there are no duplicate UserId/CustomDataKey combinations for the placeholder.
        context.UserData
            .Join(
-                context.UserData.Where(e => e.ItemId == id),
+                context.UserData.WhereOneOrMany(relatedItems, e => e.ItemId),
                placeholder => new { placeholder.UserId, placeholder.CustomDataKey },
                userData => new { userData.UserId, userData.CustomDataKey },
                (placeholder, userData) => placeholder)
@@ -125,29 +128,31 @@ public sealed class BaseItemRepository
            .ExecuteDelete();

        // Detach all user watch data
-        context.UserData.Where(e => e.ItemId == id)
+        context.UserData.WhereOneOrMany(relatedItems, e => e.ItemId)
            .ExecuteUpdate(e => e
                .SetProperty(f => f.RetentionDate, date)
                .SetProperty(f => f.ItemId, PlaceholderId));

-        context.AncestorIds.Where(e => e.ItemId == id || e.ParentItemId == id).ExecuteDelete();
-        context.AttachmentStreamInfos.Where(e => e.ItemId == id).ExecuteDelete();
-        context.BaseItemImageInfos.Where(e => e.ItemId == id).ExecuteDelete();
-        context.BaseItemMetadataFields.Where(e => e.ItemId == id).ExecuteDelete();
-        context.BaseItemProviders.Where(e => e.ItemId == id).ExecuteDelete();
-        context.BaseItemTrailerTypes.Where(e => e.ItemId == id).ExecuteDelete();
-        context.BaseItems.Where(e => e.Id == id).ExecuteDelete();
-        context.Chapters.Where(e => e.ItemId == id).ExecuteDelete();
-        context.CustomItemDisplayPreferences.Where(e => e.ItemId == id).ExecuteDelete();
-        context.ItemDisplayPreferences.Where(e => e.ItemId == id).ExecuteDelete();
+        context.AncestorIds.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.AncestorIds.WhereOneOrMany(relatedItems, e => e.ParentItemId).ExecuteDelete();
+        context.AttachmentStreamInfos.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.BaseItemImageInfos.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.BaseItemMetadataFields.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.BaseItemProviders.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.BaseItemTrailerTypes.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.BaseItems.WhereOneOrMany(relatedItems, e => e.Id).ExecuteDelete();
+        context.Chapters.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.CustomItemDisplayPreferences.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.ItemDisplayPreferences.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
        context.ItemValues.Where(e => e.BaseItemsMap!.Count == 0).ExecuteDelete();
-        context.ItemValuesMap.Where(e => e.ItemId == id).ExecuteDelete();
-        context.KeyframeData.Where(e => e.ItemId == id).ExecuteDelete();
-        context.MediaSegments.Where(e => e.ItemId == id).ExecuteDelete();
-        context.MediaStreamInfos.Where(e => e.ItemId == id).ExecuteDelete();
-        context.PeopleBaseItemMap.Where(e => e.ItemId == id).ExecuteDelete();
-        context.Peoples.Where(e => e.BaseItems!.Count == 0).ExecuteDelete();
-        context.TrickplayInfos.Where(e => e.ItemId == id).ExecuteDelete();
+        context.ItemValuesMap.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.KeyframeData.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.MediaSegments.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.MediaStreamInfos.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        var query = context.PeopleBaseItemMap.WhereOneOrMany(relatedItems, e => e.ItemId).Select(f => f.PeopleId).Distinct().ToArray();
+        context.PeopleBaseItemMap.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
+        context.Peoples.WhereOneOrMany(query, e => e.Id).Where(e => e.BaseItems!.Count == 0).ExecuteDelete();
+        context.TrickplayInfos.WhereOneOrMany(relatedItems, e => e.ItemId).ExecuteDelete();
        context.SaveChanges();
        transaction.Commit();
    }
@@ -262,12 +267,13 @@ public sealed class BaseItemRepository
        IQueryable<BaseItemEntity> dbQuery = PrepareItemQuery(context, filter);

        dbQuery = TranslateQuery(dbQuery, context, filter);
+        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
+
        if (filter.EnableTotalRecordCount)
        {
            result.TotalRecordCount = dbQuery.Count();
        }

-        dbQuery = ApplyGroupingFilter(dbQuery, filter);
        dbQuery = ApplyQueryPaging(dbQuery, filter);

        result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
@@ -286,7 +292,7 @@ public sealed class BaseItemRepository

        dbQuery = TranslateQuery(dbQuery, context, filter);

-        dbQuery = ApplyGroupingFilter(dbQuery, filter);
+        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
        dbQuery = ApplyQueryPaging(dbQuery, filter);

        return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
@@ -328,7 +334,7 @@ public sealed class BaseItemRepository
        var mainquery = PrepareItemQuery(context, filter);
        mainquery = TranslateQuery(mainquery, context, filter);
        mainquery = mainquery.Where(g => g.DateCreated >= subqueryGrouped.Min(s => s.MaxDateCreated));
-        mainquery = ApplyGroupingFilter(mainquery, filter);
+        mainquery = ApplyGroupingFilter(context, mainquery, filter);
        mainquery = ApplyQueryPaging(mainquery, filter);

        return mainquery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
@@ -365,37 +371,53 @@ public sealed class BaseItemRepository
        return query.ToArray();
    }

-    private IQueryable<BaseItemEntity> ApplyGroupingFilter(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
+    private IQueryable<BaseItemEntity> ApplyGroupingFilter(JellyfinDbContext context, IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
    {
        // This whole block is needed to filter duplicate entries on request
        // for the time being it cannot be used because it would destroy the ordering
        // this results in "duplicate" responses for queries that try to lookup individual series or multiple versions but
        // for that case the invoker has to run a DistinctBy(e => e.PresentationUniqueKey) on their own

-        // var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
-        // if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
-        // {
-        //     dbQuery = ApplyOrder(dbQuery, filter);
-        //     dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).Select(e => e.First());
-        // }
-        // else if (enableGroupByPresentationUniqueKey)
-        // {
-        //     dbQuery = ApplyOrder(dbQuery, filter);
-        //     dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).Select(e => e.First());
-        // }
-        // else if (filter.GroupBySeriesPresentationUniqueKey)
-        // {
-        //     dbQuery = ApplyOrder(dbQuery, filter);
-        //     dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).Select(e => e.First());
-        // }
-        // else
-        // {
-        //     dbQuery = dbQuery.Distinct();
-        //     dbQuery = ApplyOrder(dbQuery, filter);
-        // }
-        dbQuery = dbQuery.Distinct();
+        var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
+        if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
+        {
+            var tempQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).Select(e => e.FirstOrDefault()).Select(e => e!.Id);
+            dbQuery = context.BaseItems.Where(e => tempQuery.Contains(e.Id));
+        }
+        else if (enableGroupByPresentationUniqueKey)
+        {
+            var tempQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).Select(e => e.FirstOrDefault()).Select(e => e!.Id);
+            dbQuery = context.BaseItems.Where(e => tempQuery.Contains(e.Id));
+        }
+        else if (filter.GroupBySeriesPresentationUniqueKey)
+        {
+            var tempQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).Select(e => e.FirstOrDefault()).Select(e => e!.Id);
+            dbQuery = context.BaseItems.Where(e => tempQuery.Contains(e.Id));
+        }
+        else
+        {
+            dbQuery = dbQuery.Distinct();
+        }
+
        dbQuery = ApplyOrder(dbQuery, filter);

+        dbQuery = ApplyNavigations(dbQuery, filter);
+
+        return dbQuery;
+    }
+
+    private static IQueryable<BaseItemEntity> ApplyNavigations(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
+    {
+        dbQuery = dbQuery.Include(e => e.TrailerTypes)
+           .Include(e => e.Provider)
+           .Include(e => e.LockedFields)
+           .Include(e => e.UserData);
+
+        if (filter.DtoOptions.EnableImages)
+        {
+            dbQuery = dbQuery.Include(e => e.Images);
+        }
+
        return dbQuery;
    }

@@ -422,8 +444,7 @@ public sealed class BaseItemRepository
    private IQueryable<BaseItemEntity> ApplyQueryFilter(IQueryable<BaseItemEntity> dbQuery, JellyfinDbContext context, InternalItemsQuery filter)
    {
        dbQuery = TranslateQuery(dbQuery, context, filter);
-        dbQuery = ApplyOrder(dbQuery, filter);
-        dbQuery = ApplyGroupingFilter(dbQuery, filter);
+        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
        dbQuery = ApplyQueryPaging(dbQuery, filter);
        return dbQuery;
    }
@@ -431,15 +452,7 @@ public sealed class BaseItemRepository
    private IQueryable<BaseItemEntity> PrepareItemQuery(JellyfinDbContext context, InternalItemsQuery filter)
    {
        IQueryable<BaseItemEntity> dbQuery = context.BaseItems.AsNoTracking();
-        dbQuery = dbQuery.AsSingleQuery()
-            .Include(e => e.TrailerTypes)
-            .Include(e => e.Provider)
-            .Include(e => e.LockedFields);
-
-        if (filter.DtoOptions.EnableImages)
-        {
-            dbQuery = dbQuery.Include(e => e.Images);
-        }
+        dbQuery = dbQuery.AsSingleQuery();

        return dbQuery;
    }
@@ -470,7 +483,7 @@ public sealed class BaseItemRepository
        var counts = dbQuery
            .GroupBy(x => x.Type)
            .Select(x => new { x.Key, Count = x.Count() })
-            .AsEnumerable();
+            .ToArray();

        var lookup = _itemTypeLookup.BaseItemKindNames;
        var result = new ItemCounts();
@@ -724,13 +737,20 @@ public sealed class BaseItemRepository
        }

        using var context = _dbProvider.CreateDbContext();
-        var item = PrepareItemQuery(context, new()
+        var dbQuery = PrepareItemQuery(context, new()
        {
            DtoOptions = new()
            {
                EnableImages = true
            }
-        }).FirstOrDefault(e => e.Id == id);
+        });
+        dbQuery = dbQuery.Include(e => e.TrailerTypes)
+            .Include(e => e.Provider)
+            .Include(e => e.LockedFields)
+            .Include(e => e.UserData)
+            .Include(e => e.Images);
+
+        var item = dbQuery.FirstOrDefault(e => e.Id == id);
        if (item is null)
        {
            return null;
@@ -745,8 +765,9 @@ public sealed class BaseItemRepository
    /// <param name="entity">The entity.</param>
    /// <param name="dto">The dto base instance.</param>
    /// <param name="appHost">The Application server Host.</param>
+    /// <param name="logger">The applogger.</param>
    /// <returns>The dto to map.</returns>
-    public static BaseItemDto Map(BaseItemEntity entity, BaseItemDto dto, IServerApplicationHost? appHost)
+    public static BaseItemDto Map(BaseItemEntity entity, BaseItemDto dto, IServerApplicationHost? appHost, ILogger logger)
    {
        dto.Id = entity.Id;
        dto.ParentId = entity.ParentId.GetValueOrDefault();
@@ -791,6 +812,8 @@ public sealed class BaseItemRepository
        dto.OwnerId = string.IsNullOrWhiteSpace(entity.OwnerId) ? Guid.Empty : (Guid.TryParse(entity.OwnerId, out var ownerId) ? ownerId : Guid.Empty);
        dto.Width = entity.Width.GetValueOrDefault();
        dto.Height = entity.Height.GetValueOrDefault();
+        dto.UserData = entity.UserData;
+
        if (entity.Provider is not null)
        {
            dto.ProviderIds = entity.Provider.ToDictionary(e => e.ProviderId, e => e.ProviderValue);
@@ -1144,7 +1167,7 @@ public sealed class BaseItemRepository
            dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialize unknown type.");
        }

-        return Map(baseItemEntity, dto, appHost);
+        return Map(baseItemEntity, dto, appHost, logger);
    }

    private QueryResult<(BaseItemDto Item, ItemCounts? ItemCounts)> GetItemValues(InternalItemsQuery filter, IReadOnlyList<ItemValueType> itemValueTypes, string returnType)
@@ -1209,8 +1232,20 @@ public sealed class BaseItemRepository
            ExcludeItemIds = filter.ExcludeItemIds
        };

-        var query = TranslateQuery(innerQuery, context, outerQueryFilter)
-            .GroupBy(e => e.PresentationUniqueKey);
+        var masterQuery = TranslateQuery(innerQuery, context, outerQueryFilter)
+            .GroupBy(e => e.PresentationUniqueKey)
+            .Select(e => e.FirstOrDefault())
+            .Select(e => e!.Id);
+
+        var query = context.BaseItems
+            .Include(e => e.TrailerTypes)
+            .Include(e => e.Provider)
+            .Include(e => e.LockedFields)
+            .Include(e => e.Images)
+            .AsSingleQuery()
+            .Where(e => masterQuery.Contains(e.Id));
+
+        query = ApplyOrder(query, filter);

        var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
        if (filter.EnableTotalRecordCount)
@@ -1265,12 +1300,7 @@ public sealed class BaseItemRepository

            var resultQuery = query.Select(e => new
            {
-                item = e.AsQueryable()
-                        .Include(e => e.TrailerTypes)
-                        .Include(e => e.Provider)
-                        .Include(e => e.LockedFields)
-                        .Include(e => e.Images)
-                        .AsSingleQuery().First(),
+                item = e,
                // TODO: This is bad refactor!
                itemCount = new ItemCounts()
                {
@@ -1302,7 +1332,6 @@ public sealed class BaseItemRepository
            result.Items =
            [
                .. query
-                    .Select(e => e.First())
                    .AsEnumerable()
                    .Where(e => e is not null)
                    .Select<BaseItemEntity, (BaseItemDto, ItemCounts?)>(e =>
@@ -1666,7 +1695,15 @@ public sealed class BaseItemRepository
        if (!string.IsNullOrEmpty(filter.SearchTerm))
        {
            var searchTerm = filter.SearchTerm.ToLower();
-            baseQuery = baseQuery.Where(e => e.CleanName!.ToLower().Contains(searchTerm) || (e.OriginalTitle != null && e.OriginalTitle.ToLower().Contains(searchTerm)));
+            if (SearchWildcardTerms.Any(f => searchTerm.Contains(f)))
+            {
+                searchTerm = $"%{searchTerm.Trim('%')}%";
+                baseQuery = baseQuery.Where(e => EF.Functions.Like(e.CleanName!.ToLower(), searchTerm) || (e.OriginalTitle != null && EF.Functions.Like(e.OriginalTitle.ToLower(), searchTerm)));
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e => e.CleanName!.ToLower().Contains(searchTerm) || (e.OriginalTitle != null && e.OriginalTitle.ToLower().Contains(searchTerm)));
+            }
        }

        if (filter.IsFolder.HasValue)
@@ -1838,10 +1875,17 @@ public sealed class BaseItemRepository

        if (filter.PersonIds.Length > 0)
        {
+            var peopleEntityIds = context.BaseItems
+                .WhereOneOrMany(filter.PersonIds, b => b.Id)
+                .Join(
+                    context.Peoples,
+                    b => b.Name,
+                    p => p.Name,
+                    (b, p) => p.Id);
+
            baseQuery = baseQuery
-                .Where(e =>
-                    context.PeopleBaseItemMap.Where(w => context.BaseItems.Where(r => filter.PersonIds.Contains(r.Id)).Any(f => f.Name == w.People.Name))
-                        .Any(f => f.ItemId == e.Id));
+                .Where(e => context.PeopleBaseItemMap
+                    .Any(m => m.ItemId == e.Id && peopleEntityIds.Contains(m.PeopleId)));
        }

        if (!string.IsNullOrWhiteSpace(filter.Person))
@@ -1877,14 +1921,22 @@ public sealed class BaseItemRepository
        var nameContains = filter.NameContains;
        if (!string.IsNullOrWhiteSpace(nameContains))
        {
-            baseQuery = baseQuery.Where(e =>
-                e.CleanName!.Contains(nameContains)
-                || e.OriginalTitle!.ToLower().Contains(nameContains!));
+            if (SearchWildcardTerms.Any(f => nameContains.Contains(f)))
+            {
+                nameContains = $"%{nameContains.Trim('%')}%";
+                baseQuery = baseQuery.Where(e => EF.Functions.Like(e.CleanName, nameContains) || EF.Functions.Like(e.OriginalTitle, nameContains));
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e =>
+                                    e.CleanName!.Contains(nameContains)
+                                    || e.OriginalTitle!.ToLower().Contains(nameContains!));
+            }
        }

        if (!string.IsNullOrWhiteSpace(filter.NameStartsWith))
        {
-            baseQuery = baseQuery.Where(e => e.SortName!.StartsWith(filter.NameStartsWith) || e.Name!.StartsWith(filter.NameStartsWith));
+            baseQuery = baseQuery.Where(e => e.SortName!.StartsWith(filter.NameStartsWith));
        }

        if (!string.IsNullOrWhiteSpace(filter.NameStartsWithOrGreater))
@@ -1962,7 +2014,7 @@ public sealed class BaseItemRepository

        if (filter.ArtistIds.Length > 0)
        {
-            baseQuery = baseQuery.WhereReferencedItem(context, ItemValueType.Artist, filter.ArtistIds);
+            baseQuery = baseQuery.WhereReferencedItemMultipleTypes(context, [ItemValueType.Artist, ItemValueType.AlbumArtist], filter.ArtistIds);
        }

        if (filter.AlbumArtistIds.Length > 0)
@@ -1972,7 +2024,18 @@ public sealed class BaseItemRepository

        if (filter.ContributingArtistIds.Length > 0)
        {
-            baseQuery = baseQuery.WhereReferencedItem(context, ItemValueType.Artist, filter.ContributingArtistIds);
+            var contributingNames = context.BaseItems
+                .Where(b => filter.ContributingArtistIds.Contains(b.Id))
+                .Select(b => b.CleanName);
+
+            baseQuery = baseQuery.Where(e =>
+                e.ItemValues!.Any(ivm =>
+                    ivm.ItemValue.Type == ItemValueType.Artist &&
+                    contributingNames.Contains(ivm.ItemValue.CleanValue))
+                &&
+                !e.ItemValues!.Any(ivm =>
+                    ivm.ItemValue.Type == ItemValueType.AlbumArtist &&
+                    contributingNames.Contains(ivm.ItemValue.CleanValue)));
        }

        if (filter.AlbumIds.Length > 0)
@@ -2027,22 +2090,26 @@ public sealed class BaseItemRepository
        if (filter.MinParentalRating != null)
        {
            var min = filter.MinParentalRating;
-            minParentalRatingFilter = e => e.InheritedParentalRatingValue >= min.Score || e.InheritedParentalRatingValue == null;
-            if (min.SubScore != null)
-            {
-                minParentalRatingFilter = minParentalRatingFilter.And(e => e.InheritedParentalRatingValue >= min.SubScore || e.InheritedParentalRatingValue == null);
-            }
+            var minScore = min.Score;
+            var minSubScore = min.SubScore ?? 0;
+
+            minParentalRatingFilter = e =>
+                e.InheritedParentalRatingValue == null ||
+                e.InheritedParentalRatingValue > minScore ||
+                (e.InheritedParentalRatingValue == minScore && (e.InheritedParentalRatingSubValue ?? 0) >= minSubScore);
        }

        Expression<Func<BaseItemEntity, bool>>? maxParentalRatingFilter = null;
        if (filter.MaxParentalRating != null)
        {
            var max = filter.MaxParentalRating;
-            maxParentalRatingFilter = e => e.InheritedParentalRatingValue <= max.Score || e.InheritedParentalRatingValue == null;
-            if (max.SubScore != null)
-            {
-                maxParentalRatingFilter = maxParentalRatingFilter.And(e => e.InheritedParentalRatingValue <= max.SubScore || e.InheritedParentalRatingValue == null);
-            }
+            var maxScore = max.Score;
+            var maxSubScore = max.SubScore ?? 0;
+
+            maxParentalRatingFilter = e =>
+                e.InheritedParentalRatingValue == null ||
+                e.InheritedParentalRatingValue < maxScore ||
+                (e.InheritedParentalRatingValue == maxScore && (e.InheritedParentalRatingSubValue ?? 0) <= maxSubScore);
        }

        if (filter.HasParentalRating ?? false)
@@ -2270,8 +2337,18 @@ public sealed class BaseItemRepository

        if (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0)
        {
-            var include = filter.HasAnyProviderId.Select(e => $"{e.Key}:{e.Value}").ToArray();
-            baseQuery = baseQuery.Where(e => e.Provider!.Select(f => f.ProviderId + ":" + f.ProviderValue)!.Any(f => include.Contains(f)));
+            // Allow setting a null or empty value to get all items that have the specified provider set.
+            var includeAny = filter.HasAnyProviderId.Where(e => string.IsNullOrEmpty(e.Value)).Select(e => e.Key).ToArray();
+            if (includeAny.Length > 0)
+            {
+                baseQuery = baseQuery.Where(e => e.Provider!.Any(f => includeAny.Contains(f.ProviderId)));
+            }
+
+            var includeSelected = filter.HasAnyProviderId.Where(e => !string.IsNullOrEmpty(e.Value)).Select(e => $"{e.Key}:{e.Value}").ToArray();
+            if (includeSelected.Length > 0)
+            {
+                baseQuery = baseQuery.Where(e => e.Provider!.Select(f => f.ProviderId + ":" + f.ProviderValue)!.Any(f => includeSelected.Contains(f)));
+            }
        }

        if (filter.HasImdbId.HasValue)
@@ -2449,4 +2526,68 @@ public sealed class BaseItemRepository
            return await dbContext.BaseItems.AnyAsync(f => f.Id == id).ConfigureAwait(false);
        }
    }
+
+    /// <inheritdoc/>
+    public bool GetIsPlayed(User user, Guid id, bool recursive)
+    {
+        using var dbContext = _dbProvider.CreateDbContext();
+
+        if (recursive)
+        {
+            var folderList = TraverseHirachyDown(id, dbContext, item => (item.IsFolder || item.IsVirtualItem));
+
+            return dbContext.BaseItems
+                    .Where(e => folderList.Contains(e.ParentId!.Value) && !e.IsFolder && !e.IsVirtualItem)
+                    .All(f => f.UserData!.Any(e => e.UserId == user.Id && e.Played));
+        }
+
+        return dbContext.BaseItems.Where(e => e.ParentId == id).All(f => f.UserData!.Any(e => e.UserId == user.Id && e.Played));
+    }
+
+    private static HashSet<Guid> TraverseHirachyDown(Guid parentId, JellyfinDbContext dbContext, Expression<Func<BaseItemEntity, bool>>? filter = null)
+    {
+        var folderStack = new HashSet<Guid>()
+            {
+                parentId
+            };
+        var folderList = new HashSet<Guid>()
+            {
+                parentId
+            };
+
+        while (folderStack.Count != 0)
+        {
+            var items = folderStack.ToArray();
+            folderStack.Clear();
+            var query = dbContext.BaseItems
+                .WhereOneOrMany(items, e => e.ParentId!.Value);
+
+            if (filter != null)
+            {
+                query = query.Where(filter);
+            }
+
+            foreach (var item in query.Select(e => e.Id).ToArray())
+            {
+                if (folderList.Add(item))
+                {
+                    folderStack.Add(item);
+                }
+            }
+        }
+
+        return folderList;
+    }
+
+    /// <inheritdoc/>
+    public IReadOnlyDictionary<string, MusicArtist[]> FindArtists(IReadOnlyList<string> artistNames)
+    {
+        using var dbContext = _dbProvider.CreateDbContext();
+
+        var artists = dbContext.BaseItems.Where(e => e.Type == _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!)
+            .Where(e => artistNames.Contains(e.Name))
+            .ToArray();
+
+        return artists.GroupBy(e => e.Name).ToDictionary(e => e.Key!, e => e.Select(f => DeserializeBaseItem(f)).Cast<MusicArtist>().ToArray());
+    }
 }
--- a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Drawing;
@@ -82,11 +84,14 @@ public class ChapterRepository : IChapterRepository
    }

    /// <inheritdoc />
-    public void DeleteChapters(Guid itemId)
+    public async Task DeleteChaptersAsync(Guid itemId, CancellationToken cancellationToken)
    {
-        using var context = _dbProvider.CreateDbContext();
-        context.Chapters.Where(c => c.ItemId.Equals(itemId)).ExecuteDelete();
-        context.SaveChanges();
+        var dbContext = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (dbContext.ConfigureAwait(false))
+        {
+            await dbContext.Chapters.Where(c => c.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+            await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }
    }

    private Chapter Map(ChapterInfo chapterInfo, int index, Guid itemId)
--- a/Jellyfin.Server.Implementations/Item/KeyframeRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/KeyframeRepository.cs
@@ -55,11 +55,14 @@ public class KeyframeRepository : IKeyframeRepository
    public async Task SaveKeyframeDataAsync(Guid itemId, MediaEncoding.Keyframes.KeyframeData data, CancellationToken cancellationToken)
    {
        using var context = _dbProvider.CreateDbContext();
-        using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
-        await context.KeyframeData.Where(e => e.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
-        await context.KeyframeData.AddAsync(Map(data, itemId), cancellationToken).ConfigureAwait(false);
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+        var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
+        await using (transaction.ConfigureAwait(false))
+        {
+            await context.KeyframeData.Where(e => e.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+            await context.KeyframeData.AddAsync(Map(data, itemId), cancellationToken).ConfigureAwait(false);
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+            await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+        }
    }

    /// <inheritdoc />
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -35,16 +35,22 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
        using var context = _dbProvider.CreateDbContext();
        var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);

-        // dbQuery = dbQuery.OrderBy(e => e.ListOrder);
-        if (filter.Limit > 0)
-        {
-            dbQuery = dbQuery.Take(filter.Limit);
-        }
-
        // Include PeopleBaseItemMap
        if (!filter.ItemId.IsEmpty())
        {
-            dbQuery = dbQuery.Include(p => p.BaseItems!.Where(m => m.ItemId == filter.ItemId));
+            dbQuery = dbQuery.Include(p => p.BaseItems!.Where(m => m.ItemId == filter.ItemId))
+                .OrderBy(e => e.BaseItems!.First(e => e.ItemId == filter.ItemId).ListOrder)
+                .ThenBy(e => e.PersonType)
+                .ThenBy(e => e.Name);
+        }
+        else
+        {
+            dbQuery = dbQuery.OrderBy(e => e.Name);
+        }
+
+        if (filter.Limit > 0)
+        {
+            dbQuery = dbQuery.Take(filter.Limit);
        }

        return dbQuery.AsEnumerable().Select(Map).ToArray();
@@ -68,19 +74,48 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
    /// <inheritdoc />
    public void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people)
    {
-        using var context = _dbProvider.CreateDbContext();
+        foreach (var item in people.Where(e => e.Role is null))
+        {
+            item.Role = string.Empty;
+        }

-        // TODO: yes for __SOME__ reason there can be duplicates.
-        people = people.DistinctBy(e => e.Id).ToArray();
-        var personids = people.Select(f => f.Id);
-        var existingPersons = context.Peoples.Where(p => personids.Contains(p.Id)).Select(f => f.Id).ToArray();
-        context.Peoples.AddRange(people.Where(e => !existingPersons.Contains(e.Id)).Select(Map));
+        // multiple metadata providers can provide the _same_ person
+        people = people.DistinctBy(e => e.Name + "-" + e.Type).ToArray();
+        var personKeys = people.Select(e => e.Name + "-" + e.Type).ToArray();
+
+        using var context = _dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+        var existingPersons = context.Peoples.Select(e => new
+            {
+                item = e,
+                SelectionKey = e.Name + "-" + e.PersonType
+            })
+            .Where(p => personKeys.Contains(p.SelectionKey))
+            .Select(f => f.item)
+            .ToArray();
+
+        var toAdd = people
+            .Where(e => e.Type is not PersonKind.Artist && e.Type is not PersonKind.AlbumArtist)
+            .Where(e => !existingPersons.Any(f => f.Name == e.Name && f.PersonType == e.Type.ToString()))
+            .Select(Map);
+        context.Peoples.AddRange(toAdd);
        context.SaveChanges();

-        var maps = context.PeopleBaseItemMap.Where(e => e.ItemId == itemId).ToList();
+        var personsEntities = toAdd.Concat(existingPersons).ToArray();
+
+        var existingMaps = context.PeopleBaseItemMap.Include(e => e.People).Where(e => e.ItemId == itemId).ToList();
+
+        var listOrder = 0;
+
        foreach (var person in people)
        {
-            var existingMap = maps.FirstOrDefault(e => e.PeopleId == person.Id);
+            if (person.Type == PersonKind.Artist || person.Type == PersonKind.AlbumArtist)
+            {
+                continue;
+            }
+
+            var entityPerson = personsEntities.First(e => e.Name == person.Name && e.PersonType == person.Type.ToString());
+            var existingMap = existingMaps.FirstOrDefault(e => e.People.Name == person.Name && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
            if (existingMap is null)
            {
                context.PeopleBaseItemMap.Add(new PeopleBaseItemMap()
@@ -88,22 +123,28 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
                    Item = null!,
                    ItemId = itemId,
                    People = null!,
-                    PeopleId = person.Id,
-                    ListOrder = person.SortOrder,
+                    PeopleId = entityPerson.Id,
+                    ListOrder = listOrder,
                    SortOrder = person.SortOrder,
                    Role = person.Role
                });
            }
            else
            {
+                // Update the order for existing mappings
+                existingMap.ListOrder = listOrder;
+                existingMap.SortOrder = person.SortOrder;
                // person mapping already exists so remove from list
-                maps.Remove(existingMap);
+                existingMaps.Remove(existingMap);
            }
+
+            listOrder++;
        }

-        context.PeopleBaseItemMap.RemoveRange(maps);
+        context.PeopleBaseItemMap.RemoveRange(existingMaps);

        context.SaveChanges();
+        transaction.Commit();
    }

    private PersonInfo Map(People people)
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -68,86 +68,88 @@ public class MediaSegmentManager : IMediaSegmentManager
            return;
        }

-        using var db = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-        _logger.LogDebug("Start media segment extraction for {MediaPath} with {CountProviders} providers enabled", baseItem.Path, providers.Count);
-
-        if (forceOverwrite)
+        var db = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (db.ConfigureAwait(false))
        {
-            // delete all existing media segments if forceOverwrite is set.
-            await db.MediaSegments.Where(e => e.ItemId.Equals(baseItem.Id)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
-        }
+            _logger.LogDebug("Start media segment extraction for {MediaPath} with {CountProviders} providers enabled", baseItem.Path, providers.Count);

-        foreach (var provider in providers)
-        {
-            if (!await provider.Supports(baseItem).ConfigureAwait(false))
-            {
-                _logger.LogDebug("Media Segment provider {ProviderName} does not support item with path {MediaPath}", provider.Name, baseItem.Path);
-                continue;
-            }
-
-            IQueryable<MediaSegment> existingSegments;
            if (forceOverwrite)
            {
-                existingSegments = Array.Empty<MediaSegment>().AsQueryable();
-            }
-            else
-            {
-                existingSegments = db.MediaSegments.Where(e => e.ItemId.Equals(baseItem.Id) && e.SegmentProviderId == GetProviderId(provider.Name));
+                // delete all existing media segments if forceOverwrite is set.
+                await db.MediaSegments.Where(e => e.ItemId.Equals(baseItem.Id)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
            }

-            var requestItem = new MediaSegmentGenerationRequest()
+            foreach (var provider in providers)
            {
-                ItemId = baseItem.Id,
-                ExistingSegments = existingSegments.Select(e => Map(e)).ToArray()
-            };
-
-            try
-            {
-                var segments = await provider.GetMediaSegments(requestItem, cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (!forceOverwrite)
+                if (!await provider.Supports(baseItem).ConfigureAwait(false))
                {
-                    var existingSegmentsList = existingSegments.ToArray(); // Cannot use requestItem's list, as the provider might tamper with its items.
-                    if (segments.Count == requestItem.ExistingSegments.Count && segments.All(e => existingSegmentsList.Any(f =>
+                    _logger.LogDebug("Media Segment provider {ProviderName} does not support item with path {MediaPath}", provider.Name, baseItem.Path);
+                    continue;
+                }
+
+                IQueryable<MediaSegment> existingSegments;
+                if (forceOverwrite)
+                {
+                    existingSegments = Array.Empty<MediaSegment>().AsQueryable();
+                }
+                else
+                {
+                    existingSegments = db.MediaSegments.Where(e => e.ItemId.Equals(baseItem.Id) && e.SegmentProviderId == GetProviderId(provider.Name));
+                }
+
+                var requestItem = new MediaSegmentGenerationRequest()
+                {
+                    ItemId = baseItem.Id,
+                    ExistingSegments = existingSegments.Select(e => Map(e)).ToArray()
+                };
+
+                try
+                {
+                    var segments = await provider.GetMediaSegments(requestItem, cancellationToken)
+                        .ConfigureAwait(false);
+
+                    if (!forceOverwrite)
                    {
-                        return
-                            e.StartTicks == f.StartTicks &&
-                            e.EndTicks == f.EndTicks &&
-                            e.Type == f.Type;
-                    })))
+                        var existingSegmentsList = existingSegments.ToArray(); // Cannot use requestItem's list, as the provider might tamper with its items.
+                        if (segments.Count == requestItem.ExistingSegments.Count && segments.All(e => existingSegmentsList.Any(f =>
+                        {
+                            return
+                                e.StartTicks == f.StartTicks &&
+                                e.EndTicks == f.EndTicks &&
+                                e.Type == f.Type;
+                        })))
+                        {
+                            _logger.LogDebug("Media Segment provider {ProviderName} did not modify any segments for {MediaPath}", provider.Name, baseItem.Path);
+                            continue;
+                        }
+
+                        // delete existing media segments that were re-generated.
+                        await existingSegments.ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+                    }
+
+                    if (segments.Count == 0 && !requestItem.ExistingSegments.Any())
                    {
-                        _logger.LogDebug("Media Segment provider {ProviderName} did not modify any segments for {MediaPath}", provider.Name, baseItem.Path);
+                        _logger.LogDebug("Media Segment provider {ProviderName} did not find any segments for {MediaPath}", provider.Name, baseItem.Path);
+                        continue;
+                    }
+                    else if (segments.Count == 0 && requestItem.ExistingSegments.Any())
+                    {
+                        _logger.LogDebug("Media Segment provider {ProviderName} deleted all segments for {MediaPath}", provider.Name, baseItem.Path);
                        continue;
                    }

-                    // delete existing media segments that were re-generated.
-                    await existingSegments.ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+                    _logger.LogInformation("Media Segment provider {ProviderName} found {CountSegments} for {MediaPath}", provider.Name, segments.Count, baseItem.Path);
+                    var providerId = GetProviderId(provider.Name);
+                    foreach (var segment in segments)
+                    {
+                        segment.ItemId = baseItem.Id;
+                        await CreateSegmentAsync(segment, providerId).ConfigureAwait(false);
+                    }
                }
-
-                if (segments.Count == 0 && !requestItem.ExistingSegments.Any())
+                catch (Exception ex)
                {
-                    _logger.LogDebug("Media Segment provider {ProviderName} did not find any segments for {MediaPath}", provider.Name, baseItem.Path);
-                    continue;
+                    _logger.LogError(ex, "Provider {ProviderName} failed to extract segments from {MediaPath}", provider.Name, baseItem.Path);
                }
-                else if (segments.Count == 0 && requestItem.ExistingSegments.Any())
-                {
-                    _logger.LogDebug("Media Segment provider {ProviderName} deleted all segments for {MediaPath}", provider.Name, baseItem.Path);
-                    continue;
-                }
-
-                _logger.LogInformation("Media Segment provider {ProviderName} found {CountSegments} for {MediaPath}", provider.Name, segments.Count, baseItem.Path);
-                var providerId = GetProviderId(provider.Name);
-                foreach (var segment in segments)
-                {
-                    segment.ItemId = baseItem.Id;
-                    await CreateSegmentAsync(segment, providerId).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Provider {ProviderName} failed to extract segments from {MediaPath}", provider.Name, baseItem.Path);
            }
        }
    }
@@ -157,24 +159,34 @@ public class MediaSegmentManager : IMediaSegmentManager
    {
        ArgumentOutOfRangeException.ThrowIfLessThan(mediaSegment.EndTicks, mediaSegment.StartTicks);

-        using var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-        db.MediaSegments.Add(Map(mediaSegment, segmentProviderId));
-        await db.SaveChangesAsync().ConfigureAwait(false);
+        var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+        await using (db.ConfigureAwait(false))
+        {
+            db.MediaSegments.Add(Map(mediaSegment, segmentProviderId));
+            await db.SaveChangesAsync().ConfigureAwait(false);
+        }
+
        return mediaSegment;
    }

    /// <inheritdoc />
    public async Task DeleteSegmentAsync(Guid segmentId)
    {
-        using var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-        await db.MediaSegments.Where(e => e.Id.Equals(segmentId)).ExecuteDeleteAsync().ConfigureAwait(false);
+        var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+        await using (db.ConfigureAwait(false))
+        {
+            await db.MediaSegments.Where(e => e.Id.Equals(segmentId)).ExecuteDeleteAsync().ConfigureAwait(false);
+        }
    }

    /// <inheritdoc />
    public async Task DeleteSegmentsAsync(Guid itemId, CancellationToken cancellationToken)
    {
-        using var db = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await db.MediaSegments.Where(e => e.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+        var db = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (db.ConfigureAwait(false))
+        {
+            await db.MediaSegments.Where(e => e.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+        }
    }

    /// <inheritdoc />
@@ -186,36 +198,38 @@ public class MediaSegmentManager : IMediaSegmentManager
            return [];
        }

-        using var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-
-        var query = db.MediaSegments
-            .Where(e => e.ItemId.Equals(item.Id));
-
-        if (typeFilter is not null)
+        var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+        await using (db.ConfigureAwait(false))
        {
-            query = query.Where(e => typeFilter.Contains(e.Type));
-        }
+            var query = db.MediaSegments
+                .Where(e => e.ItemId.Equals(item.Id));

-        if (filterByProvider)
-        {
-            var providerIds = _segmentProviders
-                .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(GetProviderId(e.Name)))
-                .Select(f => GetProviderId(f.Name))
-                .ToArray();
-            if (providerIds.Length == 0)
+            if (typeFilter is not null)
            {
-                return [];
+                query = query.Where(e => typeFilter.Contains(e.Type));
            }

-            query = query.Where(e => providerIds.Contains(e.SegmentProviderId));
-        }
+            if (filterByProvider)
+            {
+                var providerIds = _segmentProviders
+                    .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(GetProviderId(e.Name)))
+                    .Select(f => GetProviderId(f.Name))
+                    .ToArray();
+                if (providerIds.Length == 0)
+                {
+                    return [];
+                }

-        return query
-            .OrderBy(e => e.StartTicks)
-            .AsNoTracking()
-            .AsEnumerable()
-            .Select(Map)
-            .ToArray();
+                query = query.Where(e => providerIds.Contains(e.SegmentProviderId));
+            }
+
+            return query
+                .OrderBy(e => e.StartTicks)
+                .AsNoTracking()
+                .AsEnumerable()
+                .Select(Map)
+                .ToArray();
+        }
    }

    private static MediaSegmentDto Map(MediaSegment segment)
--- a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
@@ -108,7 +108,7 @@ namespace Jellyfin.Server.Implementations.Users
                UserName = user.Username
            };

-            FileStream fileStream = AsyncFile.OpenWrite(filePath);
+            FileStream fileStream = AsyncFile.Create(filePath);
            await using (fileStream.ConfigureAwait(false))
            {
                await JsonSerializer.SerializeAsync(fileStream, spr).ConfigureAwait(false);
--- a/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
+++ b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
@@ -1,109 +1,116 @@
-#pragma warning disable CA1307
-#pragma warning disable CA1309
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller;
 using Microsoft.EntityFrameworkCore;

-namespace Jellyfin.Server.Implementations.Users
+namespace Jellyfin.Server.Implementations.Users;
+
+/// <summary>
+/// Manages the storage and retrieval of display preferences through Entity Framework.
+/// </summary>
+public sealed class DisplayPreferencesManager : IDisplayPreferencesManager
 {
+    private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
+
    /// <summary>
-    /// Manages the storage and retrieval of display preferences through Entity Framework.
+    /// Initializes a new instance of the <see cref="DisplayPreferencesManager"/> class.
    /// </summary>
-    public sealed class DisplayPreferencesManager : IDisplayPreferencesManager, IAsyncDisposable
+    /// <param name="dbContextFactory">The database context factory.</param>
+    public DisplayPreferencesManager(IDbContextFactory<JellyfinDbContext> dbContextFactory)
    {
-        private readonly JellyfinDbContext _dbContext;
+        _dbContextFactory = dbContextFactory;
+    }

-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisplayPreferencesManager"/> class.
-        /// </summary>
-        /// <param name="dbContextFactory">The database context factory.</param>
-        public DisplayPreferencesManager(IDbContextFactory<JellyfinDbContext> dbContextFactory)
+    /// <inheritdoc />
+    public DisplayPreferences GetDisplayPreferences(Guid userId, Guid itemId, string client)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        var prefs = dbContext.DisplayPreferences
+            .Include(pref => pref.HomeSections)
+            .FirstOrDefault(pref =>
+                pref.UserId.Equals(userId) && pref.Client == client && pref.ItemId.Equals(itemId));
+
+        if (prefs is null)
        {
-            _dbContext = dbContextFactory.CreateDbContext();
+            prefs = new DisplayPreferences(userId, itemId, client);
+            dbContext.DisplayPreferences.Add(prefs);
+            dbContext.SaveChanges();
        }

-        /// <inheritdoc />
-        public DisplayPreferences GetDisplayPreferences(Guid userId, Guid itemId, string client)
+        return prefs;
+    }
+
+    /// <inheritdoc />
+    public ItemDisplayPreferences GetItemDisplayPreferences(Guid userId, Guid itemId, string client)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        var prefs = dbContext.ItemDisplayPreferences
+            .FirstOrDefault(pref => pref.UserId.Equals(userId) && pref.ItemId.Equals(itemId) && pref.Client == client);
+
+        if (prefs is null)
        {
-            var prefs = _dbContext.DisplayPreferences
-                .Include(pref => pref.HomeSections)
-                .FirstOrDefault(pref =>
-                    pref.UserId.Equals(userId) && string.Equals(pref.Client, client) && pref.ItemId.Equals(itemId));
-
-            if (prefs is null)
-            {
-                prefs = new DisplayPreferences(userId, itemId, client);
-                _dbContext.DisplayPreferences.Add(prefs);
-            }
-
-            return prefs;
+            prefs = new ItemDisplayPreferences(userId, Guid.Empty, client);
+            dbContext.ItemDisplayPreferences.Add(prefs);
+            dbContext.SaveChanges();
        }

-        /// <inheritdoc />
-        public ItemDisplayPreferences GetItemDisplayPreferences(Guid userId, Guid itemId, string client)
+        return prefs;
+    }
+
+    /// <inheritdoc />
+    public IList<ItemDisplayPreferences> ListItemDisplayPreferences(Guid userId, string client)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        return dbContext.ItemDisplayPreferences
+            .Where(prefs => prefs.UserId.Equals(userId) && !prefs.ItemId.Equals(default) && prefs.Client == client)
+            .ToList();
+    }
+
+    /// <inheritdoc />
+    public Dictionary<string, string?> ListCustomItemDisplayPreferences(Guid userId, Guid itemId, string client)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        return dbContext.CustomItemDisplayPreferences
+            .Where(prefs => prefs.UserId.Equals(userId)
+                            && prefs.ItemId.Equals(itemId)
+                            && prefs.Client == client)
+            .ToDictionary(prefs => prefs.Key, prefs => prefs.Value);
+    }
+
+    /// <inheritdoc />
+    public void SetCustomItemDisplayPreferences(Guid userId, Guid itemId, string client, Dictionary<string, string?> customPreferences)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        dbContext.CustomItemDisplayPreferences.Where(prefs => prefs.UserId.Equals(userId)
+                            && prefs.ItemId.Equals(itemId)
+                            && prefs.Client == client)
+                            .ExecuteDelete();
+
+        foreach (var (key, value) in customPreferences)
        {
-            var prefs = _dbContext.ItemDisplayPreferences
-                .FirstOrDefault(pref => pref.UserId.Equals(userId) && pref.ItemId.Equals(itemId) && string.Equals(pref.Client, client));
-
-            if (prefs is null)
-            {
-                prefs = new ItemDisplayPreferences(userId, Guid.Empty, client);
-                _dbContext.ItemDisplayPreferences.Add(prefs);
-            }
-
-            return prefs;
+            dbContext.CustomItemDisplayPreferences
+                .Add(new CustomItemDisplayPreferences(userId, itemId, client, key, value));
        }

-        /// <inheritdoc />
-        public IList<ItemDisplayPreferences> ListItemDisplayPreferences(Guid userId, string client)
-        {
-            return _dbContext.ItemDisplayPreferences
-                .Where(prefs => prefs.UserId.Equals(userId) && !prefs.ItemId.Equals(default) && string.Equals(prefs.Client, client))
-                .ToList();
-        }
+        dbContext.SaveChanges();
+    }

-        /// <inheritdoc />
-        public Dictionary<string, string?> ListCustomItemDisplayPreferences(Guid userId, Guid itemId, string client)
-        {
-            return _dbContext.CustomItemDisplayPreferences
-                .Where(prefs => prefs.UserId.Equals(userId)
-                                && prefs.ItemId.Equals(itemId)
-                                && string.Equals(prefs.Client, client))
-                .ToDictionary(prefs => prefs.Key, prefs => prefs.Value);
-        }
+    /// <inheritdoc/>
+    public void UpdateDisplayPreferences(DisplayPreferences displayPreferences)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        dbContext.DisplayPreferences.Attach(displayPreferences).State = EntityState.Modified;
+        dbContext.SaveChanges();
+    }

-        /// <inheritdoc />
-        public void SetCustomItemDisplayPreferences(Guid userId, Guid itemId, string client, Dictionary<string, string?> customPreferences)
-        {
-            var existingPrefs = _dbContext.CustomItemDisplayPreferences
-                .Where(prefs => prefs.UserId.Equals(userId)
-                                && prefs.ItemId.Equals(itemId)
-                                && string.Equals(prefs.Client, client));
-            _dbContext.CustomItemDisplayPreferences.RemoveRange(existingPrefs);
-
-            foreach (var (key, value) in customPreferences)
-            {
-                _dbContext.CustomItemDisplayPreferences
-                    .Add(new CustomItemDisplayPreferences(userId, itemId, client, key, value));
-            }
-        }
-
-        /// <inheritdoc />
-        public void SaveChanges()
-        {
-            _dbContext.SaveChanges();
-        }
-
-        /// <inheritdoc />
-        public async ValueTask DisposeAsync()
-        {
-            await _dbContext.DisposeAsync().ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public void UpdateItemDisplayPreferences(ItemDisplayPreferences itemDisplayPreferences)
+    {
+        using var dbContext = _dbContextFactory.CreateDbContext();
+        dbContext.ItemDisplayPreferences.Attach(itemDisplayPreferences).State = EntityState.Modified;
+        dbContext.SaveChanges();
    }
 }
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -272,6 +272,7 @@ namespace Jellyfin.Server.Implementations.Users
            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
            await using (dbContext.ConfigureAwait(false))
            {
+                dbContext.Users.Attach(user);
                dbContext.Users.Remove(user);
                await dbContext.SaveChangesAsync().ConfigureAwait(false);
            }
@@ -887,7 +888,8 @@ namespace Jellyfin.Server.Implementations.Users

        private async Task UpdateUserInternalAsync(JellyfinDbContext dbContext, User user)
        {
-            dbContext.Users.Update(user);
+            dbContext.Users.Attach(user);
+            dbContext.Entry(user).State = EntityState.Modified;
            _users[user.Id] = user;
            await dbContext.SaveChangesAsync().ConfigureAwait(false);
        }
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -84,7 +84,7 @@ namespace Jellyfin.Server
            serviceCollection.AddSingleton<IAuthenticationProvider, DefaultAuthenticationProvider>();
            serviceCollection.AddSingleton<IAuthenticationProvider, InvalidAuthProvider>();
            serviceCollection.AddSingleton<IPasswordResetProvider, DefaultPasswordResetProvider>();
-            serviceCollection.AddScoped<IDisplayPreferencesManager, DisplayPreferencesManager>();
+            serviceCollection.AddSingleton<IDisplayPreferencesManager, DisplayPreferencesManager>();
            serviceCollection.AddSingleton<IDeviceManager, DeviceManager>();
            serviceCollection.AddSingleton<ITrickplayManager, TrickplayManager>();

--- a/Jellyfin.Server/Filters/AdditionalModelFilter.cs
+++ b/Jellyfin.Server/Filters/AdditionalModelFilter.cs
@@ -175,7 +175,7 @@ namespace Jellyfin.Server.Filters

            // Manually generate sync play GroupUpdate messages.
            var groupUpdateTypes = typeof(GroupUpdate<>).Assembly.GetTypes()
-                .Where(t => t.BaseType != null
+                .Where(t => t.BaseType is not null
                            && t.BaseType.IsGenericType
                            && t.BaseType.GetGenericTypeDefinition() == typeof(GroupUpdate<>))
                .ToList();
--- a/Jellyfin.Server/Filters/RetryOnTemporarilyUnavailableFilter.cs
+++ b/Jellyfin.Server/Filters/RetryOnTemporarilyUnavailableFilter.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Net.Http.Headers;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;

@@ -10,27 +8,44 @@ internal class RetryOnTemporarilyUnavailableFilter : IOperationFilter
 {
    public void Apply(OpenApiOperation operation, OperationFilterContext context)
    {
-        operation.Responses.Add("503", new OpenApiResponse()
-        {
-            Description = "The server is currently starting or is temporarily not available.",
-            Headers = new Dictionary<string, OpenApiHeader>()
+        operation.Responses.TryAdd(
+            "503",
+            new OpenApiResponse
            {
+                Description = "The server is currently starting or is temporarily not available.",
+                Headers = new Dictionary<string, OpenApiHeader>
                {
-                    "Retry-After",
-                    new() { AllowEmptyValue = true, Required = false, Description = "A hint for when to retry the operation in full seconds." }
+                    {
+                        "Retry-After", new OpenApiHeader
+                        {
+                            AllowEmptyValue = true,
+                            Required = false,
+                            Description = "A hint for when to retry the operation in full seconds.",
+                            Schema = new OpenApiSchema
+                            {
+                                Type = "integer",
+                                Format = "int32"
+                            }
+                        }
+                    },
+                    {
+                        "Message", new OpenApiHeader
+                        {
+                            AllowEmptyValue = true,
+                            Required = false,
+                            Description = "A short plain-text reason why the server is not available.",
+                            Schema = new OpenApiSchema
+                            {
+                                Type = "string",
+                                Format = "text"
+                            }
+                        }
+                    }
                },
+                Content = new Dictionary<string, OpenApiMediaType>()
                {
-                    "Message",
-                    new() { AllowEmptyValue = true, Required = false, Description = "A short plain-text reason why the server is not available." }
+                    { "text/html", new OpenApiMediaType() }
                }
-            },
-            Content = new Dictionary<string, OpenApiMediaType>()
-            {
-                {
-                    "text/html",
-                    new OpenApiMediaType()
-                }
-            }
-        });
+            });
    }
 }
--- a/Jellyfin.Server/Filters/SecurityRequirementsOperationFilter.cs
+++ b/Jellyfin.Server/Filters/SecurityRequirementsOperationFilter.cs
@@ -66,15 +66,8 @@ public class SecurityRequirementsOperationFilter : IOperationFilter
            return;
        }

-        if (!operation.Responses.ContainsKey("401"))
-        {
-            operation.Responses.Add("401", new OpenApiResponse { Description = "Unauthorized" });
-        }
-
-        if (!operation.Responses.ContainsKey("403"))
-        {
-            operation.Responses.Add("403", new OpenApiResponse { Description = "Forbidden" });
-        }
+        operation.Responses.TryAdd("401", new OpenApiResponse { Description = "Unauthorized" });
+        operation.Responses.TryAdd("403", new OpenApiResponse { Description = "Forbidden" });

        var scheme = new OpenApiSecurityScheme
        {
--- a/Jellyfin.Server/Migrations/JellyfinMigrationService.cs
+++ b/Jellyfin.Server/Migrations/JellyfinMigrationService.cs
@@ -62,7 +62,7 @@ internal class JellyfinMigrationService
 #pragma warning disable CS0618 // Type or member is obsolete
        Migrations = [.. typeof(IMigrationRoutine).Assembly.GetTypes().Where(e => typeof(IMigrationRoutine).IsAssignableFrom(e) || typeof(IAsyncMigrationRoutine).IsAssignableFrom(e))
            .Select(e => (Type: e, Metadata: e.GetCustomAttribute<JellyfinMigrationAttribute>(), Backup: e.GetCustomAttributes<JellyfinMigrationBackupAttribute>()))
-            .Where(e => e.Metadata != null)
+            .Where(e => e.Metadata is not null)
            .GroupBy(e => e.Metadata!.Stage)
            .Select(f =>
            {
@@ -137,7 +137,7 @@ internal class JellyfinMigrationService
            var migrationOptions = File.Exists(migrationConfigPath)
                 ? (MigrationOptions)xmlSerializer.DeserializeFromFile(typeof(MigrationOptions), migrationConfigPath)!
                 : null;
-            if (migrationOptions != null && migrationOptions.Applied.Count > 0)
+            if (migrationOptions is not null && migrationOptions.Applied.Count > 0)
            {
                logger.LogInformation("Old migration style migration.xml detected. Migrate now.");
                try
@@ -383,7 +383,7 @@ internal class JellyfinMigrationService
            }
        }

-        if (backupInstruction.JellyfinDb && _jellyfinDatabaseProvider != null)
+        if (backupInstruction.JellyfinDb && _jellyfinDatabaseProvider is not null)
        {
            logger.LogInformation("A migration will attempt to modify the jellyfin.db, will attempt to backup the file now.");
            _backupKey = (_backupKey.LibraryDb, await _jellyfinDatabaseProvider.MigrationBackupFast(CancellationToken.None).ConfigureAwait(false), _backupKey.FullBackup);
--- a/Jellyfin.Server/Migrations/Routines/CleanMusicArtist.cs
+++ b/Jellyfin.Server/Migrations/Routines/CleanMusicArtist.cs
@@ -0,0 +1,47 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations;
+using Jellyfin.Server.ServerSetupApp;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations.Routines;
+
+/// <summary>
+/// Cleans up all Music artists that have been migrated in the 10.11 RC migrations.
+/// </summary>
+[JellyfinMigration("2025-10-09T20:00:00", nameof(CleanMusicArtist))]
+[JellyfinMigrationBackup(JellyfinDb = true)]
+public class CleanMusicArtist : IAsyncMigrationRoutine
+{
+    private readonly IStartupLogger<CleanMusicArtist> _startupLogger;
+    private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CleanMusicArtist"/> class.
+    /// </summary>
+    /// <param name="startupLogger">The startup logger.</param>
+    /// <param name="dbContextFactory">The Db context factory.</param>
+    public CleanMusicArtist(IStartupLogger<CleanMusicArtist> startupLogger, IDbContextFactory<JellyfinDbContext> dbContextFactory)
+    {
+        _startupLogger = startupLogger;
+        _dbContextFactory = dbContextFactory;
+    }
+
+    /// <inheritdoc/>
+    public async Task PerformAsync(CancellationToken cancellationToken)
+    {
+        var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (context.ConfigureAwait(false))
+        {
+            var peoples = context.Peoples.Where(e => e.PersonType == nameof(PersonKind.Artist) || e.PersonType == nameof(PersonKind.AlbumArtist));
+            _startupLogger.LogInformation("Delete {Number} Artist and Album Artist person types from db", await peoples.CountAsync(cancellationToken).ConfigureAwait(false));
+
+            await peoples
+                .ExecuteDeleteAsync(cancellationToken)
+                .ConfigureAwait(false);
+        }
+    }
+}
--- a/Jellyfin.Server/Migrations/Routines/FixDates.cs
+++ b/Jellyfin.Server/Migrations/Routines/FixDates.cs
@@ -41,14 +41,17 @@ public class FixDates : IAsyncMigrationRoutine
    {
        if (!TimeZoneInfo.Local.Equals(TimeZoneInfo.Utc))
        {
-            using var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-            var sw = Stopwatch.StartNew();
+            var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+            await using (context.ConfigureAwait(false))
+            {
+                var sw = Stopwatch.StartNew();

-            await FixBaseItemsAsync(context, sw, cancellationToken).ConfigureAwait(false);
-            sw.Reset();
-            await FixChaptersAsync(context, sw, cancellationToken).ConfigureAwait(false);
-            sw.Reset();
-            await FixBaseItemImageInfos(context, sw, cancellationToken).ConfigureAwait(false);
+                await FixBaseItemsAsync(context, sw, cancellationToken).ConfigureAwait(false);
+                sw.Reset();
+                await FixChaptersAsync(context, sw, cancellationToken).ConfigureAwait(false);
+                sw.Reset();
+                await FixBaseItemImageInfos(context, sw, cancellationToken).ConfigureAwait(false);
+            }
        }
    }

--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
@@ -99,6 +99,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
        var baseItemIds = new HashSet<Guid>();
        using (var operation = GetPreparedDbContext("Moving TypedBaseItem"))
        {
+            IDictionary<Guid, (BaseItemEntity BaseItem, string[] Keys)> allItemsLookup = new Dictionary<Guid, (BaseItemEntity BaseItem, string[] Keys)>();
            const string typedBaseItemsQuery =
            """
            SELECT guid, type, data, StartDate, EndDate, ChannelId, IsMovie,
@@ -115,12 +116,49 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(typedBaseItemsQuery))
                {
                    var baseItem = GetItem(dto);
-                    operation.JellyfinDbContext.BaseItems.Add(baseItem.BaseItem);
-                    baseItemIds.Add(baseItem.BaseItem.Id);
-                    foreach (var dataKey in baseItem.LegacyUserDataKey)
+                    allItemsLookup.Add(baseItem.BaseItem.Id, baseItem);
+                }
+            }
+
+            bool DoesResolve(Guid? parentId, HashSet<(BaseItemEntity BaseItem, string[] Keys)> checkStack)
+            {
+                if (parentId is null)
+                {
+                    return true;
+                }
+
+                if (!allItemsLookup.TryGetValue(parentId.Value, out var parent))
+                {
+                    return false; // item is detached and has no root anymore.
+                }
+
+                if (!checkStack.Add(parent))
+                {
+                    return false; // recursive structure. Abort.
+                }
+
+                return DoesResolve(parent.BaseItem.ParentId, checkStack);
+            }
+
+            using (new TrackedMigrationStep("Clean TypedBaseItems hierarchy", _logger))
+            {
+                var checkStack = new HashSet<(BaseItemEntity BaseItem, string[] Keys)>();
+
+                foreach (var item in allItemsLookup)
+                {
+                    var cachedItem = item.Value;
+                    if (DoesResolve(cachedItem.BaseItem.ParentId, checkStack))
                    {
-                        legacyBaseItemWithUserKeys[dataKey] = baseItem.BaseItem;
+                        checkStack.Add(cachedItem);
+                        operation.JellyfinDbContext.BaseItems.Add(cachedItem.BaseItem);
+                        baseItemIds.Add(cachedItem.BaseItem.Id);
+                        foreach (var dataKey in cachedItem.Keys)
+                        {
+                            legacyBaseItemWithUserKeys[dataKey] = cachedItem.BaseItem;
+                        }
                    }
+
+                    checkStack.Clear();
                }
            }

@@ -128,6 +166,8 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
            {
                operation.JellyfinDbContext.SaveChanges();
            }
+
+            allItemsLookup.Clear();
        }

        using (var operation = GetPreparedDbContext("Moving ItemValues"))
@@ -146,6 +186,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(itemValueQuery))
                {
                    var itemId = dto.GetGuid(0);
+                    if (!baseItemIds.Contains(itemId))
+                    {
+                        continue;
+                    }
+
                    var entity = GetItemValue(dto);
                    var key = ((int)entity.Type, entity.Value);
                    if (!localItems.TryGetValue(key, out var existing))
@@ -212,6 +257,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                        continue;
                    }

+                    if (!baseItemIds.Contains(refItem.Id))
+                    {
+                        continue;
+                    }
+
                    userData.ItemId = refItem.Id;
                    operation.JellyfinDbContext.UserData.Add(userData);
                }
@@ -242,7 +292,13 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
            {
                foreach (SqliteDataReader dto in connection.Query(mediaStreamQuery))
                {
-                    operation.JellyfinDbContext.MediaStreamInfos.Add(GetMediaStream(dto));
+                    var entity = GetMediaStream(dto);
+                    if (!baseItemIds.Contains(entity.ItemId))
+                    {
+                        continue;
+                    }
+
+                    operation.JellyfinDbContext.MediaStreamInfos.Add(entity);
                }
            }

@@ -265,7 +321,13 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
            {
                foreach (SqliteDataReader dto in connection.Query(mediaAttachmentQuery))
                {
-                    operation.JellyfinDbContext.AttachmentStreamInfos.Add(GetMediaAttachment(dto));
+                    var entity = GetMediaAttachment(dto);
+                    if (!baseItemIds.Contains(entity.ItemId))
+                    {
+                        continue;
+                    }
+
+                    operation.JellyfinDbContext.AttachmentStreamInfos.Add(entity);
                }
            }

@@ -279,7 +341,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
        {
            const string personsQuery =
            """
-            SELECT ItemId, Name, Role, PersonType, SortOrder FROM People
+            SELECT ItemId, Name, Role, PersonType, SortOrder, ListOrder FROM People
            WHERE EXISTS(SELECT 1 FROM TypedBaseItems WHERE TypedBaseItems.guid = People.ItemId)
            """;

@@ -297,9 +359,9 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                    }

                    var entity = GetPerson(reader);
-                    if (!peopleCache.TryGetValue(entity.Name, out var personCache))
+                    if (!peopleCache.TryGetValue(entity.Name + "|" + entity.PersonType, out var personCache))
                    {
-                        peopleCache[entity.Name] = personCache = (entity, []);
+                        peopleCache[entity.Name + "|" + entity.PersonType] = personCache = (entity, []);
                    }

                    if (reader.TryGetString(2, out var role))
@@ -307,6 +369,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                    }

                    int? sortOrder = reader.IsDBNull(4) ? null : reader.GetInt32(4);
+                    int? listOrder = reader.IsDBNull(5) ? null : reader.GetInt32(5);

                    personCache.Items.Add(new PeopleBaseItemMap()
                    {
@@ -314,7 +377,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                        ItemId = itemId,
                        People = null!,
                        PeopleId = personCache.Person.Id,
-                        ListOrder = sortOrder,
+                        ListOrder = listOrder,
                        SortOrder = sortOrder,
                        Role = role
                    });
@@ -350,6 +413,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(chapterQuery))
                {
                    var chapter = GetChapter(dto);
+                    if (!baseItemIds.Contains(chapter.ItemId))
+                    {
+                        continue;
+                    }
+
                    operation.JellyfinDbContext.Chapters.Add(chapter);
                }
            }
@@ -376,6 +444,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(ancestorIdsQuery))
                {
                    var ancestorId = GetAncestorId(dto);
+                    if (!baseItemIds.Contains(ancestorId.ItemId) || !baseItemIds.Contains(ancestorId.ParentItemId))
+                    {
+                        continue;
+                    }
+
                    operation.JellyfinDbContext.AncestorIds.Add(ancestorId);
                }
            }
@@ -1086,12 +1159,12 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine

        if (reader.TryGetString(index++, out var providerIds))
        {
-            entity.Provider = providerIds.Split('|').Select(e => e.Split("="))
+            entity.Provider = providerIds.Split('|').Select(e => e.Split("=")).Where(e => e.Length >= 2)
            .Select(e => new BaseItemProvider()
            {
                Item = null!,
                ProviderId = e[0],
-                ProviderValue = e[1]
+                ProviderValue = string.Join('|', e.Skip(1))
            }).ToArray();
        }

@@ -1189,7 +1262,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
            ItemId = baseItemId,
            Id = Guid.NewGuid(),
            Path = e.Path,
-            Blurhash = e.BlurHash != null ? Encoding.UTF8.GetBytes(e.BlurHash) : null,
+            Blurhash = e.BlurHash is not null ? Encoding.UTF8.GetBytes(e.BlurHash) : null,
            DateModified = e.DateModified,
            Height = e.Height,
            Width = e.Width,
--- a/Jellyfin.Server/Migrations/Stages/CodeMigration.cs
+++ b/Jellyfin.Server/Migrations/Stages/CodeMigration.cs
@@ -34,12 +34,8 @@ internal class CodeMigration(Type migrationType, JellyfinMigrationAttribute meta
        {
            if (service.Lifetime == ServiceLifetime.Singleton && !service.ServiceType.IsGenericTypeDefinition)
            {
-                object? serviceInstance = serviceProvider.GetService(service.ServiceType);
-                if (serviceInstance != null)
-                {
-                    childServiceCollection.AddSingleton(service.ServiceType, serviceInstance);
-                    continue;
-                }
+                childServiceCollection.AddSingleton(service.ServiceType, _ => serviceProvider.GetService(service.ServiceType)!);
+                continue;
            }

            childServiceCollection.Add(service);
--- a/Jellyfin.Server/ServerSetupApp/SetupServer.cs
+++ b/Jellyfin.Server/ServerSetupApp/SetupServer.cs
@@ -98,7 +98,7 @@ public sealed class SetupServer : IDisposable
                        var maxLevel = logEntry.LogLevel;
                        var stack = new Stack<StartupLogTopic>(children);

-                        while (maxLevel != LogLevel.Error && stack.Count > 0 && (logEntry = stack.Pop()) != null) // error is the highest inherted error level.
+                        while (maxLevel != LogLevel.Error && stack.Count > 0 && (logEntry = stack.Pop()) is not null) // error is the highest inherted error level.
                        {
                            maxLevel = maxLevel < logEntry.LogLevel ? logEntry.LogLevel : maxLevel;
                            foreach (var child in logEntry.Children)
--- a/Jellyfin.sln
+++ b/Jellyfin.sln
@@ -96,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Database.Providers
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Database.Implementations", "src\Jellyfin.Database\Jellyfin.Database.Implementations\Jellyfin.Database.Implementations.csproj", "{8C9F9221-8415-496C-B1F5-E7756F03FA59}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.CodeAnalysis", "src\Jellyfin.CodeAnalysis\Jellyfin.CodeAnalysis.csproj", "{11643D0F-6761-4EF7-AB71-6F9F8DE00714}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -258,6 +260,10 @@ Global
 		{8C9F9221-8415-496C-B1F5-E7756F03FA59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C9F9221-8415-496C-B1F5-E7756F03FA59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C9F9221-8415-496C-B1F5-E7756F03FA59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11643D0F-6761-4EF7-AB71-6F9F8DE00714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11643D0F-6761-4EF7-AB71-6F9F8DE00714}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11643D0F-6761-4EF7-AB71-6F9F8DE00714}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11643D0F-6761-4EF7-AB71-6F9F8DE00714}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -289,6 +295,7 @@ Global
 		{4C54CE05-69C8-48FA-8785-39F7F6DB1CAD} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
 		{A5590358-33CC-4B39-BDE7-DC62FEB03C76} = {4C54CE05-69C8-48FA-8785-39F7F6DB1CAD}
 		{8C9F9221-8415-496C-B1F5-E7756F03FA59} = {4C54CE05-69C8-48FA-8785-39F7F6DB1CAD}
+		{11643D0F-6761-4EF7-AB71-6F9F8DE00714} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3448830C-EBDC-426C-85CD-7BBB9651A7FE}
--- a/MediaBrowser.Controller/Chapters/IChapterManager.cs
+++ b/MediaBrowser.Controller/Chapters/IChapterManager.cs
@@ -48,8 +48,10 @@ public interface IChapterManager
    Task<bool> RefreshChapterImages(Video video, IDirectoryService directoryService, IReadOnlyList<ChapterInfo> chapters, bool extractImages, bool saveChapters, CancellationToken cancellationToken);

    /// <summary>
-    /// Deletes the chapter images.
+    /// Deletes the chapter data.
    /// </summary>
-    /// <param name="video">Video to use.</param>
-    void DeleteChapterImages(Video video);
+    /// <param name="itemId">The item id.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>Task.</returns>
+    Task DeleteChapterDataAsync(Guid itemId, CancellationToken cancellationToken);
 }
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -107,8 +107,15 @@ namespace MediaBrowser.Controller.Entities
            ProductionLocations = Array.Empty<string>();
            RemoteTrailers = Array.Empty<MediaUrl>();
            ExtraIds = Array.Empty<Guid>();
+            UserData = [];
        }

+        /// <summary>
+        /// Gets or Sets the user data collection as cached from the last Db query.
+        /// </summary>
+        [JsonIgnore]
+        public ICollection<UserData> UserData { get; set; }
+
        [JsonIgnore]
        public string PreferredMetadataCountryCode { get; set; }

@@ -701,19 +708,7 @@ namespace MediaBrowser.Controller.Entities
        {
            get
            {
-                var customRating = CustomRating;
-                if (!string.IsNullOrEmpty(customRating))
-                {
-                    return customRating;
-                }
-
-                var parent = DisplayParent;
-                if (parent is not null)
-                {
-                    return parent.CustomRatingForComparison;
-                }
-
-                return null;
+                return GetCustomRatingForComparision();
            }
        }

@@ -791,6 +786,26 @@ namespace MediaBrowser.Controller.Entities
        /// <value>The remote trailers.</value>
        public IReadOnlyList<MediaUrl> RemoteTrailers { get; set; }

+        private string GetCustomRatingForComparision(HashSet<Guid> callstack = null)
+        {
+            callstack ??= new();
+            var customRating = CustomRating;
+            if (!string.IsNullOrEmpty(customRating))
+            {
+                return customRating;
+            }
+
+            callstack.Add(Id);
+
+            var parent = DisplayParent;
+            if (parent is not null && !callstack.Contains(parent.Id))
+            {
+                return parent.GetCustomRatingForComparision(callstack);
+            }
+
+            return null;
+        }
+
        public virtual double GetDefaultPrimaryImageAspectRatio()
        {
            return 0;
@@ -2307,27 +2322,27 @@ namespace MediaBrowser.Controller.Entities
            return UpdateToRepositoryAsync(ItemUpdateType.ImageUpdate, CancellationToken.None);
        }

-        public virtual bool IsPlayed(User user)
+        public virtual bool IsPlayed(User user, UserItemData userItemData)
        {
-            var userdata = UserDataManager.GetUserData(user, this);
+            userItemData ??= UserDataManager.GetUserData(user, this);

-            return userdata is not null && userdata.Played;
+            return userItemData is not null && userItemData.Played;
        }

-        public bool IsFavoriteOrLiked(User user)
+        public bool IsFavoriteOrLiked(User user, UserItemData userItemData)
        {
-            var userdata = UserDataManager.GetUserData(user, this);
+            userItemData ??= UserDataManager.GetUserData(user, this);

-            return userdata is not null && (userdata.IsFavorite || (userdata.Likes ?? false));
+            return userItemData is not null && (userItemData.IsFavorite || (userItemData.Likes ?? false));
        }

-        public virtual bool IsUnplayed(User user)
+        public virtual bool IsUnplayed(User user, UserItemData userItemData)
        {
            ArgumentNullException.ThrowIfNull(user);

-            var userdata = UserDataManager.GetUserData(user, this);
+            userItemData ??= UserDataManager.GetUserData(user, this);

-            return userdata is null || !userdata.Played;
+            return userItemData is null || !userItemData.Played;
        }

        ItemLookupInfo IHasLookupInfo<ItemLookupInfo>.GetLookupInfo()
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -42,6 +42,8 @@ namespace MediaBrowser.Controller.Entities
    /// </summary>
    public class Folder : BaseItem
    {
+        private IEnumerable<BaseItem> _children;
+
        public Folder()
        {
            LinkedChildren = Array.Empty<LinkedChild>();
@@ -108,11 +110,15 @@ namespace MediaBrowser.Controller.Entities
        }

        /// <summary>
-        /// Gets the actual children.
+        /// Gets or Sets the actual children.
        /// </summary>
        /// <value>The actual children.</value>
        [JsonIgnore]
-        public virtual IEnumerable<BaseItem> Children => LoadChildren();
+        public virtual IEnumerable<BaseItem> Children
+        {
+            get => _children ??= LoadChildren();
+            set => _children = value;
+        }

        /// <summary>
        /// Gets thread-safe access to all recursive children of this folder - without regard to user.
@@ -281,6 +287,7 @@ namespace MediaBrowser.Controller.Entities
        /// <returns>Task.</returns>
        public Task ValidateChildren(IProgress<double> progress, MetadataRefreshOptions metadataRefreshOptions, bool recursive = true, bool allowRemoveRoot = false, CancellationToken cancellationToken = default)
        {
+            Children = null; // invalidate cached children.
            return ValidateChildrenInternal(progress, recursive, true, allowRemoveRoot, metadataRefreshOptions, metadataRefreshOptions.DirectoryService, cancellationToken);
        }

@@ -288,6 +295,7 @@ namespace MediaBrowser.Controller.Entities
        {
            var dictionary = new Dictionary<Guid, BaseItem>();

+            Children = null; // invalidate cached children.
            var childrenList = Children.ToList();

            foreach (var child in childrenList)
@@ -329,6 +337,11 @@ namespace MediaBrowser.Controller.Entities

            try
            {
+                if (GetParents().Any(f => f.Id.Equals(Id)))
+                {
+                    throw new InvalidOperationException("Recursive datastructure detected abort processing this item.");
+                }
+
                await ValidateChildrenInternal2(progress, recursive, refreshChildMetadata, allowRemoveRoot, refreshOptions, directoryService, cancellationToken).ConfigureAwait(false);
            }
            finally
@@ -444,6 +457,12 @@ namespace MediaBrowser.Controller.Entities
                {
                    foreach (var item in itemsRemoved)
                    {
+                        if (!item.CanDelete())
+                        {
+                            Logger.LogDebug("Item marked as non-removable, skipping: {Path}", item.Path ?? item.Name);
+                            continue;
+                        }
+
                        if (item.IsFileProtocol)
                        {
                            Logger.LogDebug("Removed item: {Path}", item.Path);
@@ -526,6 +545,7 @@ namespace MediaBrowser.Controller.Entities
                {
                    if (validChildrenNeedGeneration)
                    {
+                        Children = null; // invalidate cached children.
                        validChildren = Children.ToList();
                    }

@@ -568,7 +588,8 @@ namespace MediaBrowser.Controller.Entities

                if (recursive && child is Folder folder)
                {
-                    await folder.RefreshMetadataRecursive(folder.Children.ToList(), refreshOptions, true, progress, cancellationToken).ConfigureAwait(false);
+                    folder.Children = null; // invalidate cached children.
+                    await folder.RefreshMetadataRecursive(folder.Children.Except([this, child]).ToList(), refreshOptions, true, progress, cancellationToken).ConfigureAwait(false);
                }
            }
        }
@@ -686,16 +707,22 @@ namespace MediaBrowser.Controller.Entities
                IEnumerable<BaseItem> items;
                Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);

+                var totalCount = 0;
                if (query.User is null)
                {
                    items = GetRecursiveChildren(filter);
+                    totalCount = items.Count();
                }
                else
                {
-                    items = GetRecursiveChildren(user, query);
+                    items = GetRecursiveChildren(user, query, out totalCount);
+                    query.Limit = null;
+                    query.StartIndex = null; // override these here as they have already been applied
                }

-                return PostFilterAndSort(items, query);
+                var result = PostFilterAndSort(items, query);
+                result.TotalRecordCount = totalCount;
+                return result;
            }

            if (this is not UserRootFolder
@@ -944,22 +971,34 @@ namespace MediaBrowser.Controller.Entities

            IEnumerable<BaseItem> items;

+            int totalItemCount = 0;
            if (query.User is null)
            {
                items = Children.Where(filter);
+                totalItemCount = items.Count();
            }
            else
            {
                // need to pass this param to the children.
                var childQuery = new InternalItemsQuery
                {
-                    DisplayAlbumFolders = query.DisplayAlbumFolders
+                    DisplayAlbumFolders = query.DisplayAlbumFolders,
+                    Limit = query.Limit,
+                    StartIndex = query.StartIndex,
+                    NameStartsWith = query.NameStartsWith,
+                    NameStartsWithOrGreater = query.NameStartsWithOrGreater,
+                    NameLessThan = query.NameLessThan
                };

-                items = GetChildren(user, true, childQuery).Where(filter);
+                items = GetChildren(user, true, out totalItemCount, childQuery).Where(filter);
+
+                query.Limit = null;
+                query.StartIndex = null;
            }

-            return PostFilterAndSort(items, query);
+            var result = PostFilterAndSort(items, query);
+            result.TotalRecordCount = totalItemCount;
+            return result;
        }

        protected QueryResult<BaseItem> PostFilterAndSort(IEnumerable<BaseItem> items, InternalItemsQuery query)
@@ -1242,30 +1281,30 @@ namespace MediaBrowser.Controller.Entities
            return true;
        }

-        public IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren)
-        {
-            ArgumentNullException.ThrowIfNull(user);
-
-            return GetChildren(user, includeLinkedChildren, new InternalItemsQuery(user));
-        }
-
-        public virtual IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
+        public virtual IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, out int totalItemCount, InternalItemsQuery query = null)
        {
            ArgumentNullException.ThrowIfNull(user);
+            query ??= new InternalItemsQuery();
+            query.User = user;

            // the true root should return our users root folder children
            if (IsPhysicalRoot)
            {
-                return LibraryManager.GetUserRootFolder().GetChildren(user, includeLinkedChildren);
+                return LibraryManager.GetUserRootFolder().GetChildren(user, includeLinkedChildren, out totalItemCount);
            }

            var result = new Dictionary<Guid, BaseItem>();

-            AddChildren(user, includeLinkedChildren, result, false, query);
+            totalItemCount = AddChildren(user, includeLinkedChildren, result, false, query);

            return result.Values.ToArray();
        }

+        public virtual IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query = null)
+        {
+            return GetChildren(user, includeLinkedChildren, out _, query);
+        }
+
        protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
        {
            return Children;
@@ -1274,13 +1313,13 @@ namespace MediaBrowser.Controller.Entities
        /// <summary>
        /// Adds the children to list.
        /// </summary>
-        private void AddChildren(User user, bool includeLinkedChildren, Dictionary<Guid, BaseItem> result, bool recursive, InternalItemsQuery query, HashSet<Folder> visitedFolders = null)
+        private int AddChildren(User user, bool includeLinkedChildren, Dictionary<Guid, BaseItem> result, bool recursive, InternalItemsQuery query, HashSet<Folder> visitedFolders = null)
        {
            // Prevent infinite recursion of nested folders
            visitedFolders ??= new HashSet<Folder>();
            if (!visitedFolders.Add(this))
            {
-                return;
+                return 0;
            }

            // If Query.AlbumFolders is set, then enforce the format as per the db in that it permits sub-folders in music albums.
@@ -1297,44 +1336,67 @@ namespace MediaBrowser.Controller.Entities
                children = GetEligibleChildrenForRecursiveChildren(user);
            }

-            AddChildrenFromCollection(children, user, includeLinkedChildren, result, recursive, query, visitedFolders);
-
            if (includeLinkedChildren)
            {
-                AddChildrenFromCollection(GetLinkedChildren(user), user, includeLinkedChildren, result, recursive, query, visitedFolders);
+                children = children.Concat(GetLinkedChildren(user)).ToArray();
            }
+
+            return AddChildrenFromCollection(children, user, includeLinkedChildren, result, recursive, query, visitedFolders);
        }

-        private void AddChildrenFromCollection(IEnumerable<BaseItem> children, User user, bool includeLinkedChildren, Dictionary<Guid, BaseItem> result, bool recursive, InternalItemsQuery query, HashSet<Folder> visitedFolders)
+        private int AddChildrenFromCollection(IEnumerable<BaseItem> children, User user, bool includeLinkedChildren, Dictionary<Guid, BaseItem> result, bool recursive, InternalItemsQuery query, HashSet<Folder> visitedFolders)
        {
-            foreach (var child in children)
-            {
-                if (!child.IsVisible(user))
-                {
-                    continue;
-                }
+            query ??= new InternalItemsQuery();
+            var limit = query.Limit > 0 ? query.Limit : int.MaxValue;
+            query.Limit = 0;

-                if (query is null || UserViewBuilder.FilterItem(child, query))
+            var visibleChildren = children
+                .Where(e => e.IsVisible(user))
+                .ToArray();
+
+            var realChildren = visibleChildren
+                .Where(e => query is null || UserViewBuilder.FilterItem(e, query))
+                .ToArray();
+
+            if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0))
+            {
+                realChildren = realChildren
+                    .OrderBy(e => e.ProductionYear ?? int.MaxValue)
+                    .ToArray();
+            }
+
+            var childCount = realChildren.Length;
+            if (result.Count < limit)
+            {
+                var remainingCount = (int)(limit - result.Count);
+                foreach (var child in realChildren
+                    .Skip(query.StartIndex ?? 0)
+                    .Take(remainingCount))
                {
                    result[child.Id] = child;
                }
+            }

-                if (recursive && child.IsFolder)
+            if (recursive)
+            {
+                foreach (var child in visibleChildren
+                    .Where(e => e.IsFolder)
+                    .OfType<Folder>())
                {
-                    var folder = (Folder)child;
-
-                    folder.AddChildren(user, includeLinkedChildren, result, true, query, visitedFolders);
+                    childCount += child.AddChildren(user, includeLinkedChildren, result, true, query, visitedFolders);
                }
            }
+
+            return childCount;
        }

-        public virtual IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public virtual IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query, out int totalCount)
        {
            ArgumentNullException.ThrowIfNull(user);

            var result = new Dictionary<Guid, BaseItem>();

-            AddChildren(user, true, result, true, query);
+            totalCount = AddChildren(user, true, result, true, query);

            return result.Values.ToArray();
        }
@@ -1666,23 +1728,14 @@ namespace MediaBrowser.Controller.Entities
            }
        }

-        public override bool IsPlayed(User user)
+        public override bool IsPlayed(User user, UserItemData userItemData)
        {
-            var itemsResult = GetItemList(new InternalItemsQuery(user)
-            {
-                Recursive = true,
-                IsFolder = false,
-                IsVirtualItem = false,
-                EnableTotalRecordCount = false
-            });
-
-            return itemsResult
-                .All(i => i.IsPlayed(user));
+            return ItemRepository.GetIsPlayed(user, Id, true);
        }

-        public override bool IsUnplayed(User user)
+        public override bool IsUnplayed(User user, UserItemData userItemData)
        {
-            return !IsPlayed(user);
+            return !IsPlayed(user, userItemData);
        }

        public override void FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, DtoOptions fields)
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -136,9 +136,9 @@ namespace MediaBrowser.Controller.Entities.Movies
            return Sort(children, user).ToArray();
        }

-        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query, out int totalCount)
        {
-            var children = base.GetRecursiveChildren(user, query);
+            var children = base.GetRecursiveChildren(user, query, out totalCount);
            return Sort(children, user).ToArray();
        }

--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Entities.TV

        public override int GetChildCount(User user)
        {
-            var result = GetChildren(user, true).Count;
+            var result = GetChildren(user, true, null).Count;

            return result;
        }
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -297,6 +297,7 @@ namespace MediaBrowser.Controller.Entities.TV

        public async Task RefreshAllMetadata(MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
        {
+            Children = null; // invalidate cached children.
            // Refresh bottom up, seasons and episodes first, then the series
            var items = GetRecursiveChildren();

--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -89,7 +89,7 @@ namespace MediaBrowser.Controller.Entities
        /// <inheritdoc />
        public override int GetChildCount(User user)
        {
-            return GetChildren(user, true).Count;
+            return GetChildren(user, true, null).Count;
        }

        /// <inheritdoc />
@@ -134,20 +134,22 @@ namespace MediaBrowser.Controller.Entities
        }

        /// <inheritdoc />
-        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query, out int totalCount)
        {
            query.SetUser(user);
            query.Recursive = true;
            query.EnableTotalRecordCount = false;
            query.ForceDirect = true;
+            var data = GetItemList(query);
+            totalCount = data.Count;

-            return GetItemList(query);
+            return data;
        }

        /// <inheritdoc />
        protected override IReadOnlyList<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
        {
-            return GetChildren(user, false);
+            return GetChildren(user, false, null);
        }

        public static bool IsUserSpecific(Folder folder)
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -472,6 +472,23 @@ namespace MediaBrowser.Controller.Entities

        public static bool Filter(BaseItem item, User user, InternalItemsQuery query, IUserDataManager userDataManager, ILibraryManager libraryManager)
        {
+            if (!string.IsNullOrEmpty(query.NameStartsWith) && !item.SortName.StartsWith(query.NameStartsWith, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return false;
+            }
+
+#pragma warning disable CA1309 // Use ordinal string comparison
+            if (!string.IsNullOrEmpty(query.NameStartsWithOrGreater) && string.Compare(query.NameStartsWithOrGreater, item.SortName, StringComparison.InvariantCultureIgnoreCase) == 1)
+            {
+                return false;
+            }
+
+            if (!string.IsNullOrEmpty(query.NameLessThan) && string.Compare(query.NameLessThan, item.SortName, StringComparison.InvariantCultureIgnoreCase) != 1)
+#pragma warning restore CA1309 // Use ordinal string comparison
+            {
+                return false;
+            }
+
            if (query.MediaTypes.Length > 0 && !query.MediaTypes.Contains(item.MediaType))
            {
                return false;
@@ -502,7 +519,6 @@ namespace MediaBrowser.Controller.Entities
            if (query.IsLiked.HasValue)
            {
                userData = userDataManager.GetUserData(user, item);
-
                if (!userData.Likes.HasValue || userData.Likes != query.IsLiked.Value)
                {
                    return false;
@@ -511,7 +527,7 @@ namespace MediaBrowser.Controller.Entities

            if (query.IsFavoriteOrLiked.HasValue)
            {
-                userData = userData ?? userDataManager.GetUserData(user, item);
+                userData ??= userDataManager.GetUserData(user, item);
                var isFavoriteOrLiked = userData.IsFavorite || (userData.Likes ?? false);

                if (isFavoriteOrLiked != query.IsFavoriteOrLiked.Value)
@@ -522,8 +538,7 @@ namespace MediaBrowser.Controller.Entities

            if (query.IsFavorite.HasValue)
            {
-                userData = userData ?? userDataManager.GetUserData(user, item);
-
+                userData ??= userDataManager.GetUserData(user, item);
                if (userData.IsFavorite != query.IsFavorite.Value)
                {
                    return false;
@@ -532,7 +547,7 @@ namespace MediaBrowser.Controller.Entities

            if (query.IsResumable.HasValue)
            {
-                userData = userData ?? userDataManager.GetUserData(user, item);
+                userData ??= userDataManager.GetUserData(user, item);
                var isResumable = userData.PlaybackPositionTicks > 0;

                if (isResumable != query.IsResumable.Value)
@@ -543,7 +558,8 @@ namespace MediaBrowser.Controller.Entities

            if (query.IsPlayed.HasValue)
            {
-                if (item.IsPlayed(user) != query.IsPlayed.Value)
+                userData ??= userDataManager.GetUserData(user, item);
+                if (item.IsPlayed(user, userData) != query.IsPlayed.Value)
                {
                    return false;
                }
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -152,16 +152,7 @@ namespace MediaBrowser.Controller.Entities
        {
            get
            {
-                if (!string.IsNullOrEmpty(PrimaryVersionId))
-                {
-                    var item = LibraryManager.GetItemById(PrimaryVersionId);
-                    if (item is Video video)
-                    {
-                        return video.MediaSourceCount;
-                    }
-                }
-
-                return LinkedAlternateVersions.Length + LocalAlternateVersions.Length + 1;
+                return GetMediaSourceCount();
            }
        }

@@ -259,6 +250,27 @@ namespace MediaBrowser.Controller.Entities
        [JsonIgnore]
        public override MediaType MediaType => MediaType.Video;

+        private int GetMediaSourceCount(HashSet<Guid> callstack = null)
+        {
+            callstack ??= new();
+            if (!string.IsNullOrEmpty(PrimaryVersionId))
+            {
+                var item = LibraryManager.GetItemById(PrimaryVersionId);
+                if (item is Video video)
+                {
+                    if (callstack.Contains(video.Id))
+                    {
+                        return video.LinkedAlternateVersions.Length + video.LocalAlternateVersions.Length + 1;
+                    }
+
+                    callstack.Add(video.Id);
+                    return video.GetMediaSourceCount(callstack);
+                }
+            }
+
+            return LinkedAlternateVersions.Length + LocalAlternateVersions.Length + 1;
+        }
+
        public override List<string> GetUserDataKeys()
        {
            var list = base.GetUserDataKeys();
--- a/MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
@@ -167,12 +167,12 @@ public static class XmlReaderExtensions

        // Only split by comma if there is no pipe in the string
        // We have to be careful to not split names like Matthew, Jr.
-        var separator = !value.Contains('|', StringComparison.Ordinal)
+        ReadOnlySpan<char> separator = !value.Contains('|', StringComparison.Ordinal)
            && !value.Contains(';', StringComparison.Ordinal)
-                ? new[] { ',' }
-                : new[] { '|', ';' };
+                ? stackalloc[] { ',' }
+                : stackalloc[] { '|', ';' };

-        foreach (var part in value.Trim().Trim(separator).Split(separator))
+        foreach (var part in value.AsSpan().Trim().Trim(separator).ToString().Split(separator))
        {
            if (!string.IsNullOrWhiteSpace(part))
            {
--- a/MediaBrowser.Controller/IDisplayPreferencesManager.cs
+++ b/MediaBrowser.Controller/IDisplayPreferencesManager.cs
@@ -60,8 +60,15 @@ namespace MediaBrowser.Controller
        void SetCustomItemDisplayPreferences(Guid userId, Guid itemId, string client, Dictionary<string, string?> customPreferences);

        /// <summary>
-        /// Saves changes made to the database.
+        /// Updates or Creates the display preferences.
        /// </summary>
-        void SaveChanges();
+        /// <param name="displayPreferences">The entity to update or create.</param>
+        void UpdateDisplayPreferences(DisplayPreferences displayPreferences);
+
+        /// <summary>
+        /// Updates or Creates the display preferences for the given item.
+        /// </summary>
+        /// <param name="itemDisplayPreferences">The entity to update or create.</param>
+        void UpdateItemDisplayPreferences(ItemDisplayPreferences itemDisplayPreferences);
    }
 }
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -336,6 +336,13 @@ namespace MediaBrowser.Controller.Library
        /// <param name="options">Options to use for deletion.</param>
        void DeleteItem(BaseItem item, DeleteOptions options);

+        /// <summary>
+        /// Deletes items that are not having any children like Actors.
+        /// </summary>
+        /// <param name="items">Items to delete.</param>
+        /// <remarks>In comparison to <see cref="DeleteItem(BaseItem, DeleteOptions, BaseItem, bool)"/> this method skips a lot of steps assuming there are no children to recusively delete nor does it define the special handling for channels and alike.</remarks>
+        public void DeleteItemsUnsafeFast(IEnumerable<BaseItem> items);
+
        /// <summary>
        /// Deletes the item.
        /// </summary>
@@ -624,6 +631,8 @@ namespace MediaBrowser.Controller.Library

        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery query);

+        IReadOnlyDictionary<string, MusicArtist[]> GetArtists(IReadOnlyList<string> names);
+
        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery query);

        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery query);
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -6552,7 +6552,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                if (isD3d11Supported && isCodecAvailable)
                {
                    return " -hwaccel d3d11va" + (outputHwSurface ? " -hwaccel_output_format d3d11 -noautorotate" + stripRotationDataArgs : string.Empty)
-                        + (profileMismatch ? " -hwaccel_flags +allow_profile_mismatch" : string.Empty) + (isAv1 ? " -c:v av1" : string.Empty);
+                        + (profileMismatch ? " -hwaccel_flags +allow_profile_mismatch" : string.Empty) + " -threads 2" + (isAv1 ? " -c:v av1" : string.Empty);
                }
            }

--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -4,7 +4,6 @@

 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using Jellyfin.Data.Enums;
@@ -22,8 +21,7 @@ namespace MediaBrowser.Controller.MediaEncoding
    // For now, a common base class until the API and MediaEncoding classes are unified
    public class EncodingJobInfo
    {
-        public int? OutputAudioBitrate;
-        public int? OutputAudioChannels;
+        private static readonly char[] _separators = ['|', ','];

        private TranscodeReason? _transcodeReasons = null;

@@ -36,6 +34,10 @@ namespace MediaBrowser.Controller.MediaEncoding
            SupportedSubtitleCodecs = Array.Empty<string>();
        }

+        public int? OutputAudioBitrate { get; set; }
+
+        public int? OutputAudioChannels { get; set; }
+
        public TranscodeReason TranscodeReasons
        {
            get
@@ -586,7 +588,7 @@ namespace MediaBrowser.Controller.MediaEncoding
        {
            if (!string.IsNullOrEmpty(BaseRequest.Profile))
            {
-                return BaseRequest.Profile.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return BaseRequest.Profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
            }

            if (!string.IsNullOrEmpty(codec))
@@ -595,7 +597,7 @@ namespace MediaBrowser.Controller.MediaEncoding

                if (!string.IsNullOrEmpty(profile))
                {
-                    return profile.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    return profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
                }
            }

@@ -606,7 +608,7 @@ namespace MediaBrowser.Controller.MediaEncoding
        {
            if (!string.IsNullOrEmpty(BaseRequest.VideoRangeType))
            {
-                return BaseRequest.VideoRangeType.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return BaseRequest.VideoRangeType.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
            }

            if (!string.IsNullOrEmpty(codec))
@@ -615,7 +617,7 @@ namespace MediaBrowser.Controller.MediaEncoding

                if (!string.IsNullOrEmpty(rangetype))
                {
-                    return rangetype.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    return rangetype.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
                }
            }

@@ -626,7 +628,7 @@ namespace MediaBrowser.Controller.MediaEncoding
        {
            if (!string.IsNullOrEmpty(BaseRequest.CodecTag))
            {
-                return BaseRequest.CodecTag.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return BaseRequest.CodecTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
            }

            if (!string.IsNullOrEmpty(codec))
@@ -635,7 +637,7 @@ namespace MediaBrowser.Controller.MediaEncoding

                if (!string.IsNullOrEmpty(codectag))
                {
-                    return codectag.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    return codectag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
                }
            }

--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -53,5 +53,13 @@ namespace MediaBrowser.Controller.MediaEncoding
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>System.String.</returns>
        Task<string> GetSubtitleFilePath(MediaStream subtitleStream, MediaSourceInfo mediaSource, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Extracts all extractable subtitles (text and pgs).
+        /// </summary>
+        /// <param name="mediaSource">The mediaSource.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken);
    }
 }
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -80,6 +80,16 @@ namespace MediaBrowser.Controller.Net
        /// <returns>Task{`1}.</returns>
        protected abstract Task<TReturnDataType> GetDataToSend();

+        /// <summary>
+        /// Gets the data to send for a specific connection.
+        /// </summary>
+        /// <param name="connection">The connection.</param>
+        /// <returns>Task{`1}.</returns>
+        protected virtual Task<TReturnDataType> GetDataToSendForConnection(IWebSocketConnection connection)
+        {
+            return GetDataToSend();
+        }
+
        /// <summary>
        /// Processes the message.
        /// </summary>
@@ -174,17 +184,11 @@ namespace MediaBrowser.Controller.Net
                            continue;
                        }

-                        var data = await GetDataToSend().ConfigureAwait(false);
-                        if (data is null)
-                        {
-                            continue;
-                        }
-
                        IEnumerable<Task> GetTasks()
                        {
                            foreach (var tuple in tuples)
                            {
-                                yield return SendDataInternal(data, tuple);
+                                yield return SendDataForConnectionAsync(tuple);
                            }
                        }

@@ -198,12 +202,19 @@ namespace MediaBrowser.Controller.Net
            }
        }

-        private async Task SendDataInternal(TReturnDataType data, (IWebSocketConnection Connection, CancellationTokenSource CancellationTokenSource, TStateType State) tuple)
+        private async Task SendDataForConnectionAsync((IWebSocketConnection Connection, CancellationTokenSource CancellationTokenSource, TStateType State) tuple)
        {
            try
            {
                var (connection, cts, state) = tuple;
                var cancellationToken = cts.Token;
+
+                var data = await GetDataToSendForConnection(connection).ConfigureAwait(false);
+                if (data is null)
+                {
+                    return;
+                }
+
                await connection.SendAsync(
                    new OutboundWebSocketMessage<TReturnDataType> { MessageType = Type, Data = data },
                    cancellationToken).ConfigureAwait(false);
--- a/Show More
+++ b/Show More