Update dependency BitFaster.Caching to 2.6.0

2026-05-13 12:16:49 +01:00 · 2026-05-04 18:36:34 +00:00
158 changed files with 1134 additions and 6327 deletions
--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -32,13 +32,13 @@ jobs:
        dotnet-version: '10.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+      uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended

    - name: Autobuild
-      uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+      uses: github/codeql-action/autobuild@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+      uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -35,7 +35,7 @@ jobs:
          --verbosity minimal

      - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@049f7ec958c672fd31d5cc1cb01622dc8d2e23ab # v5.5.10
+        uses: danielpalme/ReportGenerator-GitHub-Action@c31aa4ed4f12f147061186cf2a029f307b5c3636 # v5.5.9
        with:
          reports: "**/coverage.cobertura.xml"
          targetdir: "merged/"
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -118,7 +118,6 @@
 - [Phlogi](https://github.com/Phlogi)
 - [pjeanjean](https://github.com/pjeanjean)
 - [ploughpuff](https://github.com/ploughpuff)
- - [poytiis](https://github.com/poytiis)
 - [pR0Ps](https://github.com/pR0Ps)
 - [PrplHaz4](https://github.com/PrplHaz4)
 - [RazeLighter777](https://github.com/RazeLighter777)
@@ -230,7 +229,6 @@
 - [LiHRaM](https://github.com/LiHRaM)
 - [MSalman5230](https://github.com/MSalman5230)
 - [dwandw](https://github.com/dwandw)
- - [Lampan-git](https://github.com/Lampan-git)

 # Emby Contributors

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,7 @@
    <PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0" />
    <PackageVersion Include="AutoFixture" Version="4.18.1" />
    <PackageVersion Include="BDInfo" Version="0.8.0" />
-    <PackageVersion Include="BitFaster.Caching" Version="2.5.4" />
+    <PackageVersion Include="BitFaster.Caching" Version="2.6.0" />
    <PackageVersion Include="BlurHashSharp.SkiaSharp" Version="1.4.0-pre.1" />
    <PackageVersion Include="BlurHashSharp" Version="1.4.0-pre.1" />
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
@@ -26,27 +26,27 @@
    <PackageVersion Include="libse" Version="4.0.12" />
    <PackageVersion Include="LrcParser" Version="2025.623.0" />
    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.7" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
    <PackageVersion Include="MimeTypes" Version="2.5.2" />
    <PackageVersion Include="Morestachio" Version="5.0.1.670" />
@@ -77,7 +77,7 @@
    <PackageVersion Include="Svg.Skia" Version="3.4.1" />
    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="10.1.7" />
    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.7" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.8" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.7" />
    <PackageVersion Include="TagLibSharp" Version="2.3.0" />
    <PackageVersion Include="z440.atl.core" Version="7.13.0" />
    <PackageVersion Include="TMDbLib" Version="3.0.0" />
--- a/Emby.Naming/AudioBook/AudioBookNameParserResult.cs
+++ b/Emby.Naming/AudioBook/AudioBookNameParserResult.cs
@@ -1,5 +1,3 @@
-#pragma warning disable CA1815
-
 namespace Emby.Naming.AudioBook
 {
    /// <summary>
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -36,7 +36,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>12.0.0</VersionPrefix>
+    <VersionPrefix>10.12.0</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Emby.Naming/TV/SeasonPathParser.cs
+++ b/Emby.Naming/TV/SeasonPathParser.cs
@@ -12,10 +12,10 @@ namespace Emby.Naming.TV
    {
        private static readonly Regex CleanNameRegex = new(@"[ ._\-\[\]]", RegexOptions.Compiled);

-        [GeneratedRegex(@"^\s*((?<seasonnumber>(?>\d+))(?:st|nd|rd|th|\.)*(?!\s*[Ee]\d+))\s*(?:[[시즌]*|[シーズン]*|[sS](?:eason|æson|aison|taffel|eries|tagione|äsong|eizoen|easong|ezon|ezona|ezóna|ezonul|érie|éria|erie|eria)*|[tT](?:emporada)*|[kK](?:ausi)*|[Сс](?:езон)*)\s*(?<rightpart>.*)$", RegexOptions.IgnoreCase)]
+        [GeneratedRegex(@"^\s*((?<seasonnumber>(?>\d+))(?:st|nd|rd|th|\.)*(?!\s*[Ee]\d+))\s*(?:[[시즌]*|[シーズン]*|[sS](?:eason|æson|aison|taffel|eries|tagione|äsong|eizoen|easong|ezon|ezona|ezóna|ezonul)*|[tT](?:emporada)*|[kK](?:ausi)*|[Сс](?:езон)*)\s*(?<rightpart>.*)$", RegexOptions.IgnoreCase)]
        private static partial Regex ProcessPre();

-        [GeneratedRegex(@"^\s*(?:[[시즌]*|[シーズン]*|[sS](?:eason|æson|aison|taffel|eries|tagione|äsong|eizoen|easong|ezon|ezona|ezóna|ezonul|érie|éria|erie|eria)*|[tT](?:emporada)*|[kK](?:ausi)*|[Сс](?:езон)*)\s*(?<seasonnumber>\d+?)(?=\d{3,4}p|[^\d]|$)(?!\s*[Ee]\d)(?<rightpart>.*)$", RegexOptions.IgnoreCase)]
+        [GeneratedRegex(@"^\s*(?:[[시즌]*|[シーズン]*|[sS](?:eason|æson|aison|taffel|eries|tagione|äsong|eizoen|easong|ezon|ezona|ezóna|ezonul)*|[tT](?:emporada)*|[kK](?:ausi)*|[Сс](?:езон)*)\s*(?<seasonnumber>\d+?)(?=\d{3,4}p|[^\d]|$)(?!\s*[Ee]\d)(?<rightpart>.*)$", RegexOptions.IgnoreCase)]
        private static partial Regex ProcessPost();

        [GeneratedRegex(@"[sS](\d{1,4})(?!\d|[eE]\d)(?=\.|_|-|\[|\]|\s|$)", RegexOptions.None)]
--- a/Emby.Naming/Video/CleanDateTimeResult.cs
+++ b/Emby.Naming/Video/CleanDateTimeResult.cs
@@ -1,5 +1,3 @@
-#pragma warning disable CA1815
-
 namespace Emby.Naming.Video
 {
    /// <summary>
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -166,6 +166,8 @@ namespace Emby.Server.Implementations
                ConfigurationManager.Configuration,
                ApplicationPaths.PluginsPath,
                ApplicationVersion);
+
+            _disposableParts.Add(_pluginManager);
        }

        /// <summary>
@@ -1012,8 +1014,6 @@ namespace Emby.Server.Implementations
                }

                _disposableParts.Clear();
-
-                _pluginManager?.Dispose();
            }

            _disposed = true;
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -203,39 +203,6 @@ namespace Emby.Server.Implementations.Dto
                }
            }

-            // Batch-fetch MusicArtist lookups across all items to avoid N+1 queries.
-            IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch = null;
-            var artistNames = new HashSet<string>(StringComparer.Ordinal);
-            foreach (var item in accessibleItems)
-            {
-                if (item is IHasArtist hasArtist)
-                {
-                    foreach (var name in hasArtist.Artists)
-                    {
-                        if (!string.IsNullOrWhiteSpace(name))
-                        {
-                            artistNames.Add(name);
-                        }
-                    }
-                }
-
-                if (item is IHasAlbumArtist hasAlbumArtist)
-                {
-                    foreach (var name in hasAlbumArtist.AlbumArtists)
-                    {
-                        if (!string.IsNullOrWhiteSpace(name))
-                        {
-                            artistNames.Add(name);
-                        }
-                    }
-                }
-            }
-
-            if (artistNames.Count > 0)
-            {
-                artistsBatch = _libraryManager.GetArtists(artistNames.ToArray());
-            }
-
            for (int index = 0; index < accessibleItems.Count; index++)
            {
                var item = accessibleItems[index];
@@ -247,8 +214,7 @@ namespace Emby.Server.Implementations.Dto
                    userDataBatch?.GetValueOrDefault(item.Id),
                    allCollectionFolders,
                    childCountBatch,
-                    playedCountBatch,
-                    artistsBatch);
+                    playedCountBatch);

                if (item is LiveTvChannel tvChannel)
                {
@@ -308,8 +274,7 @@ namespace Emby.Server.Implementations.Dto
            UserItemData? userData = null,
            List<Folder>? allCollectionFolders = null,
            Dictionary<Guid, int>? childCountBatch = null,
-            Dictionary<Guid, (int Played, int Total)>? playedCountBatch = null,
-            IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch = null)
+            Dictionary<Guid, (int Played, int Total)>? playedCountBatch = null)
        {
            var dto = new BaseItemDto
            {
@@ -369,7 +334,7 @@ namespace Emby.Server.Implementations.Dto
                AttachStudios(dto, item);
            }

-            AttachBasicFields(dto, item, owner, options, artistsBatch);
+            AttachBasicFields(dto, item, owner, options);

            if (options.ContainsField(ItemFields.CanDelete))
            {
@@ -942,8 +907,7 @@ namespace Emby.Server.Implementations.Dto
        /// <param name="item">The item.</param>
        /// <param name="owner">The owner.</param>
        /// <param name="options">The options.</param>
-        /// <param name="artistsBatch">Optional pre-fetched artist lookup shared across a batch of items.</param>
-        private void AttachBasicFields(BaseItemDto dto, BaseItem item, BaseItem? owner, DtoOptions options, IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch = null)
+        private void AttachBasicFields(BaseItemDto dto, BaseItem item, BaseItem? owner, DtoOptions options)
        {
            if (options.ContainsField(ItemFields.DateCreated))
            {
@@ -1067,8 +1031,6 @@ namespace Emby.Server.Implementations.Dto
                dto.OriginalTitle = item.OriginalTitle;
            }

-            dto.OriginalLanguage = item.OriginalLanguage;
-
            if (options.ContainsField(ItemFields.ParentId))
            {
                dto.ParentId = item.DisplayParentId;
@@ -1190,8 +1152,7 @@ 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();
-                var artistsLookup = artistsBatch
-                    ?? _libraryManager.GetArtists([.. hasArtist.Artists.Where(e => !string.IsNullOrWhiteSpace(e))]);
+                var artistsLookup = _libraryManager.GetArtists([.. hasArtist.Artists.Where(e => !string.IsNullOrWhiteSpace(e))]);

                dto.ArtistItems = hasArtist.Artists
                    .Where(name => !string.IsNullOrWhiteSpace(name))
@@ -1225,8 +1186,7 @@ namespace Emby.Server.Implementations.Dto
                //    })
                //    .ToList();

-                var albumArtistsLookup = artistsBatch
-                    ?? _libraryManager.GetArtists([.. hasAlbumArtist.AlbumArtists.Where(e => !string.IsNullOrWhiteSpace(e))]);
+                var albumArtistsLookup = _libraryManager.GetArtists([.. hasAlbumArtist.AlbumArtists.Where(e => !string.IsNullOrWhiteSpace(e))]);

                dto.AlbumArtists = hasAlbumArtist.AlbumArtists
                    .Where(name => !string.IsNullOrWhiteSpace(name))
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -23,7 +23,6 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
@@ -424,7 +423,7 @@ namespace Emby.Server.Implementations.Library
            MediaStreamSelector.SetSubtitleStreamScores(source.MediaStreams, preferredSubs, user.SubtitleMode, audioLanguage);
        }

-        private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection, string originalLanguage)
+        private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
        {
            if (userData is not null && userData.AudioStreamIndex.HasValue && user.RememberAudioSelections && allowRememberingSelection)
            {
@@ -438,42 +437,7 @@ namespace Emby.Server.Implementations.Library
                }
            }

-            if (string.Equals(user.AudioLanguagePreference, "OriginalLanguage", StringComparison.OrdinalIgnoreCase))
-            {
-                originalLanguage = !string.IsNullOrWhiteSpace(originalLanguage)
-                    ? originalLanguage.Split(',').FirstOrDefault()
-                    : null;
-
-                if (user.PlayDefaultAudioTrack)
-                {
-                    source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(
-                        source.MediaStreams,
-                        NormalizeLanguage(originalLanguage),
-                        user.PlayDefaultAudioTrack);
-                    return;
-                }
-
-                var originalIndex = source.MediaStreams.FindIndex(i => i.Type == MediaStreamType.Audio && i.IsOriginal);
-
-                if (!string.IsNullOrWhiteSpace(originalLanguage) && originalIndex != -1)
-                {
-                    var mediaLanguageOriginal = source.MediaStreams[originalIndex].Language;
-                    if (NormalizeLanguage(mediaLanguageOriginal).Contains(NormalizeLanguage(originalLanguage).FirstOrDefault()))
-                    {
-                        source.DefaultAudioStreamIndex = originalIndex;
-                        return;
-                    }
-                }
-                else if (originalIndex != -1)
-                {
-                    source.DefaultAudioStreamIndex = originalIndex;
-                    return;
-                }
-            }
-
-            var preferredAudio = string.Equals(user.AudioLanguagePreference, "OriginalLanguage", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(originalLanguage)
-                ? NormalizeLanguage(originalLanguage)
-                : NormalizeLanguage(user.AudioLanguagePreference);
+            var preferredAudio = NormalizeLanguage(user.AudioLanguagePreference);

            source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.PlayDefaultAudioTrack);
            if (user.PlayDefaultAudioTrack)
@@ -498,19 +462,7 @@ namespace Emby.Server.Implementations.Library

                var allowRememberingSelection = item is null || item.EnableRememberingTrackSelections;

-                var originalLanguage = item?.OriginalLanguage ?? item switch
-                {
-                    Episode episode => episode.Series.OriginalLanguage,
-                    Video video => video.GetOwner() switch
-                    {
-                        Episode ownerEpisode => ownerEpisode.OriginalLanguage ?? ownerEpisode.Series.OriginalLanguage,
-                        BaseItem owner => owner.OriginalLanguage,
-                        null => null
-                    },
-                    _ => null
-                };
-
-                SetDefaultAudioStreamIndex(source, userData, user, allowRememberingSelection, originalLanguage);
+                SetDefaultAudioStreamIndex(source, userData, user, allowRememberingSelection);
                SetDefaultSubtitleStreamIndex(source, userData, user, allowRememberingSelection);
            }
            else if (mediaType == MediaType.Audio)
--- a/Emby.Server.Implementations/Library/PathExtensions.cs
+++ b/Emby.Server.Implementations/Library/PathExtensions.cs
@@ -70,16 +70,6 @@ namespace Emby.Server.Implementations.Library
                return match ? imdbId.ToString() : null;
            }

-            // Allow tmdb as an alias for tmdbid
-            if (attribute.Equals("tmdbid", StringComparison.OrdinalIgnoreCase))
-            {
-                var tmdbValue = str.GetAttributeValue("tmdb");
-                if (tmdbValue is not null)
-                {
-                    return tmdbValue;
-                }
-            }
-
            return null;
        }

--- a/Emby.Server.Implementations/Library/PathManager.cs
+++ b/Emby.Server.Implementations/Library/PathManager.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
-using Microsoft.Extensions.Logging;

 namespace Emby.Server.Implementations.Library;

@@ -15,22 +14,18 @@ namespace Emby.Server.Implementations.Library;
 /// </summary>
 public class PathManager : IPathManager
 {
-    private readonly ILogger<PathManager> _logger;
    private readonly IServerConfigurationManager _config;
    private readonly IApplicationPaths _appPaths;

    /// <summary>
    /// Initializes a new instance of the <see cref="PathManager"/> class.
    /// </summary>
-    /// <param name="logger">The logger.</param>
    /// <param name="config">The server configuration manager.</param>
    /// <param name="appPaths">The application paths.</param>
    public PathManager(
-        ILogger<PathManager> logger,
        IServerConfigurationManager config,
        IApplicationPaths appPaths)
    {
-        _logger = logger;
        _config = config;
        _appPaths = appPaths;
    }
@@ -40,43 +35,31 @@ public class PathManager : IPathManager
    private string AttachmentCachePath => Path.Combine(_appPaths.DataPath, "attachments");

    /// <inheritdoc />
-    public string? GetAttachmentPath(string mediaSourceId, string fileName)
+    public string GetAttachmentPath(string mediaSourceId, string fileName)
    {
-        var folder = GetAttachmentFolderPath(mediaSourceId);
-        return folder is null ? null : Path.Combine(folder, fileName);
+        return Path.Combine(GetAttachmentFolderPath(mediaSourceId), fileName);
    }

    /// <inheritdoc />
-    public string? GetAttachmentFolderPath(string mediaSourceId)
+    public string GetAttachmentFolderPath(string mediaSourceId)
    {
-        if (!Guid.TryParse(mediaSourceId, out var parsed))
-        {
-            _logger.LogDebug("MediaSource Id '{MediaSourceId}' is not a GUID; no on-disk attachment folder.", mediaSourceId);
-            return null;
-        }
+        var id = Guid.Parse(mediaSourceId).ToString("D", CultureInfo.InvariantCulture).AsSpan();

-        var id = parsed.ToString("D", CultureInfo.InvariantCulture).AsSpan();
        return Path.Join(AttachmentCachePath, id[..2], id);
    }

    /// <inheritdoc />
-    public string? GetSubtitleFolderPath(string mediaSourceId)
+    public string GetSubtitleFolderPath(string mediaSourceId)
    {
-        if (!Guid.TryParse(mediaSourceId, out var parsed))
-        {
-            _logger.LogDebug("MediaSource Id '{MediaSourceId}' is not a GUID; no on-disk subtitle folder.", mediaSourceId);
-            return null;
-        }
+        var id = Guid.Parse(mediaSourceId).ToString("D", CultureInfo.InvariantCulture).AsSpan();

-        var id = parsed.ToString("D", CultureInfo.InvariantCulture).AsSpan();
        return Path.Join(SubtitleCachePath, id[..2], id);
    }

    /// <inheritdoc />
-    public string? GetSubtitlePath(string mediaSourceId, int streamIndex, string extension)
+    public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension)
    {
-        var folder = GetSubtitleFolderPath(mediaSourceId);
-        return folder is null ? null : Path.Combine(folder, streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
+        return Path.Combine(GetSubtitleFolderPath(mediaSourceId), streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
    }

    /// <inheritdoc />
@@ -107,23 +90,12 @@ public class PathManager : IPathManager
    public IReadOnlyList<string> GetExtractedDataPaths(BaseItem item)
    {
        var mediaSourceId = item.Id.ToString("N", CultureInfo.InvariantCulture);
-        List<string> paths = [];
-        var attachmentFolder = GetAttachmentFolderPath(mediaSourceId);
-        if (attachmentFolder is not null)
-        {
-            paths.Add(attachmentFolder);
-        }
-
-        var subtitleFolder = GetSubtitleFolderPath(mediaSourceId);
-        if (subtitleFolder is not null)
-        {
-            paths.Add(subtitleFolder);
-        }
-
-        paths.Add(GetTrickplayDirectory(item, false));
-        paths.Add(GetTrickplayDirectory(item, true));
-        paths.Add(GetChapterImageFolderPath(item));
-
-        return paths;
+        return [
+            GetAttachmentFolderPath(mediaSourceId),
+            GetSubtitleFolderPath(mediaSourceId),
+            GetTrickplayDirectory(item, false),
+            GetTrickplayDirectory(item, true),
+            GetChapterImageFolderPath(item)
+        ];
    }
 }
--- a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -1,10 +1,8 @@
 #nullable disable

 using System;
-using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
-using Emby.Server.Implementations.Library;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
@@ -83,34 +81,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                    episode.ParentIndexNumber = 1;
                }

-                SetProviderIdFromPath(episode, args.Path);
-
                return episode;
            }

            return null;
        }
-
-        /// <summary>
-        /// Sets provider ids from the episode file name.
-        /// </summary>
-        /// <param name="item">The episode.</param>
-        /// <param name="path">The episode file path.</param>
-        private static void SetProviderIdFromPath(Episode item, string path)
-        {
-            var justName = Path.GetFileNameWithoutExtension(path.AsSpan());
-
-            var imdbId = justName.GetAttributeValue("imdbid");
-            item.TrySetProviderId(MetadataProvider.Imdb, imdbId);
-
-            var tvdbId = justName.GetAttributeValue("tvdbid");
-            item.TrySetProviderId(MetadataProvider.Tvdb, tvdbId);
-
-            var tvmazeId = justName.GetAttributeValue("tvmazeid");
-            item.TrySetProviderId(MetadataProvider.TvMaze, tvmazeId);
-
-            var tmdbId = justName.GetAttributeValue("tmdbid");
-            item.TrySetProviderId(MetadataProvider.Tmdb, tmdbId);
-        }
    }
 }
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -1,15 +1,10 @@
 #nullable disable

-using System;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using Emby.Naming.Common;
 using Emby.Naming.TV;
-using Emby.Server.Implementations.Library;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using Microsoft.Extensions.Logging;

@@ -82,14 +77,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV

                        return null;
                    }
-
-                    var hasAnyVideo = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories)
-                        .Any(file => _namingOptions.VideoFileExtensions.Contains(Path.GetExtension(file)));
-
-                    if (!hasAnyVideo)
-                    {
-                        return null;
-                    }
                }

                if (season.IndexNumber.HasValue && string.IsNullOrEmpty(season.Name))
@@ -104,31 +91,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                            args.LibraryOptions.PreferredMetadataLanguage);
                }

-                SetProviderIdFromPath(season, path);
-
                return season;
            }

            return null;
        }
-
-        /// <summary>
-        /// Sets provider ids from the season folder name.
-        /// </summary>
-        /// <param name="item">The season.</param>
-        /// <param name="path">The season folder path.</param>
-        private static void SetProviderIdFromPath(Season item, string path)
-        {
-            var justName = Path.GetFileName(path.AsSpan());
-
-            var tvdbId = justName.GetAttributeValue("tvdbid");
-            item.TrySetProviderId(MetadataProvider.Tvdb, tvdbId);
-
-            var tvmazeId = justName.GetAttributeValue("tvmazeid");
-            item.TrySetProviderId(MetadataProvider.TvMaze, tvmazeId);
-
-            var tmdbId = justName.GetAttributeValue("tmdbid");
-            item.TrySetProviderId(MetadataProvider.Tmdb, tmdbId);
-        }
    }
 }
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -135,6 +135,5 @@
    "TaskMoveTrickplayImages": "نقل موقع صور معاينات التنقل",
    "TaskMoveTrickplayImagesDescription": "ينقل ملفات معاينات التنقل الحالية وفقاً لإعدادات المكتبة.",
    "CleanupUserDataTask": "مهمة تنظيف بيانات المستخدم",
-    "CleanupUserDataTaskDescription": "ينظف جميع بيانات المستخدم (مثل حالة المشاهدة وحالة المفضلة وغيرها) للمحتوى الذي لم يعد موجوداً لمدة 90 يوماً على الأقل.",
-    "Original": "فريد"
+    "CleanupUserDataTaskDescription": "ينظف جميع بيانات المستخدم (مثل حالة المشاهدة وحالة المفضلة وغيرها) للمحتوى الذي لم يعد موجوداً لمدة 90 يوماً على الأقل."
 }
--- a/Emby.Server.Implementations/Localization/Core/cs.json
+++ b/Emby.Server.Implementations/Localization/Core/cs.json
@@ -135,6 +135,5 @@
    "TaskMoveTrickplayImages": "Přesunout úložiště obrázků Trickplay",
    "TaskMoveTrickplayImagesDescription": "Přesune existující soubory Trickplay podle nastavení knihovny.",
    "CleanupUserDataTaskDescription": "Odstraní všechna uživatelská data (stav zhlédnutí, oblíbené atd.) z médií, které již neexistují více než 90 dní.",
-    "CleanupUserDataTask": "Pročistit uživatelská data",
-    "Original": "Originál"
+    "CleanupUserDataTask": "Pročistit uživatelská data"
 }
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -135,6 +135,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 (Abspielstatus, Favoritenstatus, usw.) von Medien, die seit mindestens 90 Tagen nicht mehr vorhanden sind.",
-    "Original": "Original"
+    "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/en-US.json
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -64,7 +64,6 @@
    "NotificationOptionUserLockedOut": "User locked out",
    "NotificationOptionVideoPlayback": "Video playback started",
    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "Original": "Original",
    "Photos": "Photos",
    "Playlists": "Playlists",
    "Plugin": "Plugin",
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -135,6 +135,5 @@
    "TaskExtractMediaSegmentsDescription": "Extrae u obtiene segmentos de medios de plugins habilitados para MediaSegment.",
    "TaskMoveTrickplayImages": "Migrar la ubicación de la imagen de Trickplay",
    "CleanupUserDataTask": "Tarea de limpieza de datos del usuario",
-    "CleanupUserDataTaskDescription": "Limpia todos los datos del usuario (estado de visualización, favoritos, etc.) de los medios que ya no están disponibles desde hace al menos 90 días.",
-    "Original": "Original"
+    "CleanupUserDataTaskDescription": "Limpia todos los datos del usuario (estado de visualización, favoritos, etc.) de los medios que ya no están disponibles desde hace al menos 90 días."
 }
--- a/Emby.Server.Implementations/Localization/Core/ga.json
+++ b/Emby.Server.Implementations/Localization/Core/ga.json
@@ -135,6 +135,5 @@
    "TaskCleanTranscode": "Eolaire Transcode Glan",
    "TaskDownloadMissingSubtitles": "Íosluchtaigh fotheidil ar iarraidh",
    "CleanupUserDataTask": "Tasc glantacháin sonraí úsáideora",
-    "CleanupUserDataTaskDescription": "Glanann sé gach sonraí úsáideora (stádas faire, stádas is fearr leat srl.) ó mheáin nach bhfuil i láthair a thuilleadh ar feadh 90 lá ar a laghad.",
-    "Original": "Bunaidh"
+    "CleanupUserDataTaskDescription": "Glanann sé gach sonraí úsáideora (stádas faire, stádas is fearr leat srl.) ó mheáin nach bhfuil i láthair a thuilleadh ar feadh 90 lá ar a laghad."
 }
--- a/Emby.Server.Implementations/Localization/Core/hr.json
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -135,6 +135,5 @@
    "TaskMoveTrickplayImages": "Premjesti mjesto slika brzog pregledavanja",
    "TaskMoveTrickplayImagesDescription": "Premješta postojeće datoteke brzog pregledavanja u postavke 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.",
-    "Original": "Original"
+    "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/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -39,7 +39,7 @@
    "MixedContent": "Vegyes tartalom",
    "Movies": "Filmek",
    "Music": "Zenék",
-    "MusicVideos": "Zenei videók",
+    "MusicVideos": "Zenei videóklipek",
    "NameInstallFailed": "{0} sikertelen telepítés",
    "NameSeasonNumber": "{0}. évad",
    "NameSeasonUnknown": "Ismeretlen évad",
@@ -135,6 +135,5 @@
    "TaskMoveTrickplayImagesDescription": "A médiatár-beállításoknak megfelelően áthelyezi a meglévő trickplay fájlokat.",
    "TaskExtractMediaSegmentsDescription": "Kinyeri vagy megszerzi a médiaszegmenseket a MediaSegment támogatással rendelkező bővítményekből.",
    "CleanupUserDataTaskDescription": "Legalább 90 napja nem elérhető médiákhoz kapcsolódó összes felhasználói adat (pl. megtekintési állapot, kedvencek) törlése.",
-    "CleanupUserDataTask": "Felhasználói adatok tisztítása feladat",
-    "Original": "Eredeti"
+    "CleanupUserDataTask": "Felhasználói adatok tisztítása feladat"
 }
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -135,6 +135,5 @@
    "TaskExtractMediaSegmentsDescription": "Estrae o ottiene segmenti multimediali dai plugin abilitati MediaSegment.",
    "TaskExtractMediaSegments": "Scansiona Segmento Media",
    "CleanupUserDataTask": "Task di pulizia dei dati utente",
-    "CleanupUserDataTaskDescription": "Pulisce tutti i dati utente (stato di visione, status preferiti, ecc.) dai contenuti non più presenti da almeno 90 giorni.",
-    "Original": "Originale"
+    "CleanupUserDataTaskDescription": "Pulisce tutti i dati utente (stato di visione, status preferiti, ecc.) dai contenuti non più presenti da almeno 90 giorni."
 }
--- a/Emby.Server.Implementations/Localization/Core/lv.json
+++ b/Emby.Server.Implementations/Localization/Core/lv.json
@@ -135,6 +135,5 @@
    "TaskDownloadMissingLyrics": "Lejupielādēt trūkstošos vārdus",
    "TaskDownloadMissingLyricsDescription": "Lejupielādēt vārdus dziesmām",
    "CleanupUserDataTask": "Lietotāju datu tīrīšanas uzdevums",
-    "CleanupUserDataTaskDescription": "Notīra visus lietotāja datus (skatīšanās stāvokļus, favorītu statusi utt.) no medijiem, kas vairs nav pieejami vismaz 90 dienas.",
-    "Original": "Oriģināls"
+    "CleanupUserDataTaskDescription": "Notīra visus lietotāja datus (skatīšanās stāvokļus, favorītu statusi utt.) no medijiem, kas vairs nav pieejami vismaz 90 dienas."
 }
--- a/Emby.Server.Implementations/Localization/Core/ne.json
+++ b/Emby.Server.Implementations/Localization/Core/ne.json
@@ -45,7 +45,7 @@
    "Genres": "विधाहरू",
    "Folders": "फोल्डरहरू",
    "Favorites": "मनपर्ने",
-    "FailedLoginAttemptWithUserName": "असफल लग इन प्रयास {0} देखि",
+    "FailedLoginAttemptWithUserName": "{0}को लग इन प्रयास असफल",
    "DeviceOnlineWithName": "{0}को साथ जडित",
    "DeviceOfflineWithName": "{0}बाट विच्छेदन भयो",
    "Collections": "संग्रह",
--- a/Emby.Server.Implementations/Localization/Core/nl.json
+++ b/Emby.Server.Implementations/Localization/Core/nl.json
@@ -135,6 +135,5 @@
    "CleanupUserDataTaskDescription": "Wist alle gebruikersgegevens (kijkstatus, favorieten, etc.) van media die al minstens 90 dagen niet meer aanwezig zijn.",
    "CleanupUserDataTask": "Opruimtaak gebruikersdata",
    "Albums": "Albums",
-    "Genres": "Genres",
-    "Original": "Oorspronkelijk"
+    "Genres": "Genres"
 }
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -135,6 +135,5 @@
    "TaskExtractMediaSegmentsDescription": "Wyodrębnia lub pobiera segmenty mediów z wtyczek obsługujących MediaSegment.",
    "TaskMoveTrickplayImagesDescription": "Przenosi istniejące pliki Trickplay zgodnie z ustawieniami biblioteki.",
    "CleanupUserDataTaskDescription": "Usuwa wszystkie dane użytkownika (stan oglądanych, status ulubionych itp.) z mediów, które nie są dostępne od co najmniej 90 dni.",
-    "CleanupUserDataTask": "Zadanie czyszczenia danych użytkownika",
-    "Original": "Oryginalny"
+    "CleanupUserDataTask": "Zadanie czyszczenia danych użytkownika"
 }
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -135,6 +135,5 @@
    "TaskExtractMediaSegmentsDescription": "Extrai ou obtém segmentos de multimédia a partir de plugins com suporte para MediaSegment.",
    "TaskMoveTrickplayImagesDescription": "Move os ficheiros trickplay existentes de acordo com as definições da mediateca.",
    "CleanupUserDataTaskDescription": "Apaga todos os dados de utilizador (estados de reprodução, favoritos, etc) de arquivos média não presentes há 90 dias ou mais.",
-    "CleanupUserDataTask": "Limpeza de dados de utilizador",
-    "Original": "Original"
+    "CleanupUserDataTask": "Limpeza de dados de utilizador"
 }
--- a/Emby.Server.Implementations/Localization/Core/pt.json
+++ b/Emby.Server.Implementations/Localization/Core/pt.json
@@ -135,6 +135,5 @@
    "TaskExtractMediaSegmentsDescription": "Extrai ou obtém segmentos de multimédia a partir de plugins com suporte para MediaSegment.",
    "TaskMoveTrickplayImages": "Migrar a localização da imagem do Trickplay",
    "CleanupUserDataTask": "Task de limpeza de dados do usuário",
-    "CleanupUserDataTaskDescription": "Remove todos os dados do usuário (progresso, favoritos etc) de mídias que não estão presentes há pelo menos 90 dias.",
-    "Original": "Original"
+    "CleanupUserDataTaskDescription": "Remove todos os dados do usuário (progresso, favoritos etc) de mídias que não estão presentes há pelo menos 90 dias."
 }
--- a/Emby.Server.Implementations/Localization/Core/sv.json
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -135,6 +135,5 @@
    "TaskMoveTrickplayImages": "Migrera platsen för Trickplay-bilder",
    "TaskMoveTrickplayImagesDescription": "Flyttar befintliga trickplay-filer enligt bibliotekets inställningar.",
    "CleanupUserDataTaskDescription": "Tar bort all användardata (såsom vad du sett, favoriter med mera) för media som inte funnits på enheten på minst 90 dagar.",
-    "CleanupUserDataTask": "Uppgift för rensning av användardata",
-    "Original": "Original"
+    "CleanupUserDataTask": "Uppgift för rensning av användardata"
 }
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -320,14 +320,6 @@ namespace Emby.Server.Implementations.Localization
                {
                    return value;
                }
-
-                if (ratingsDictionary is not null && rating.Length > countryCode.Length
-                    && rating.StartsWith(countryCode, StringComparison.OrdinalIgnoreCase)
-                    && (rating[countryCode.Length] == '-' || rating[countryCode.Length] == ':')
-                    && ratingsDictionary.TryGetValue(rating[(countryCode.Length + 1)..].Trim(), out var normalizedValue))
-                {
-                    return normalizedValue;
-                }
            }
            else
            {
@@ -353,70 +345,35 @@ namespace Emby.Server.Implementations.Localization
                }
            }

-            // Try splitting by country prefix separator to handle "US:PG-13", "Germany: FSK-18", "DE-FSK-18"
-            if (TryGetRatingScoreBySeparator(rating, ':', out var result)
-                || TryGetRatingScoreBySeparator(rating, '-', out result))
+            // Try splitting by : to handle "Germany: FSK-18"
+            if (rating.Contains(':', StringComparison.OrdinalIgnoreCase))
            {
-                return result;
+                var ratingLevelRightPart = rating.AsSpan().RightPart(':');
+                if (ratingLevelRightPart.Length != 0)
+                {
+                    return GetRatingScore(ratingLevelRightPart.ToString());
+                }
+            }
+
+            // Handle prefix country code to handle "DE-18"
+            if (rating.Contains('-', StringComparison.OrdinalIgnoreCase))
+            {
+                var ratingSpan = rating.AsSpan();
+
+                // Extract culture from country prefix
+                var culture = FindLanguageInfo(ratingSpan.LeftPart('-').ToString());
+
+                var ratingLevelRightPart = ratingSpan.RightPart('-');
+                if (ratingLevelRightPart.Length != 0)
+                {
+                    // Check rating system of culture
+                    return GetRatingScore(ratingLevelRightPart.ToString(), culture?.TwoLetterISOLanguageName);
+                }
            }

            return null;
        }

-        private bool TryGetRatingScoreBySeparator(string rating, char separator, out ParentalRatingScore? result)
-        {
-            result = null;
-
-            if (rating.IndexOf(separator, StringComparison.Ordinal) < 0)
-            {
-                return false;
-            }
-
-            var ratingSpan = rating.AsSpan();
-            var countryPart = ratingSpan.LeftPart(separator).Trim().ToString();
-            var ratingPart = ratingSpan.RightPart(separator).Trim().ToString();
-            if (ratingPart.Length == 0)
-            {
-                return false;
-            }
-
-            string? resolvedCountryCode = null;
-
-            if (_allParentalRatings.ContainsKey(countryPart))
-            {
-                resolvedCountryCode = countryPart;
-            }
-            else
-            {
-                var culture = FindLanguageInfo(countryPart);
-                if (culture is not null)
-                {
-                    resolvedCountryCode = culture.TwoLetterISOLanguageName;
-                }
-            }
-
-            if (resolvedCountryCode is not null
-                && _allParentalRatings.TryGetValue(resolvedCountryCode, out var countryRatings))
-            {
-                if (countryRatings.TryGetValue(ratingPart, out result))
-                {
-                    return true;
-                }
-
-                _logger.LogWarning(
-                    "Rating '{Rating}' not found in the '{CountryCode}' rating system, treating as unrated",
-                    rating,
-                    resolvedCountryCode);
-
-                return true;
-            }
-
-            // Country not identified or no rating data available, try recursive lookup
-            result = GetRatingScore(ratingPart, resolvedCountryCode);
-
-            return true;
-        }
-
        /// <inheritdoc />
        public string GetLocalizedString(string phrase)
        {
--- a/Emby.Server.Implementations/Localization/Ratings/ca.json
+++ b/Emby.Server.Implementations/Localization/Ratings/ca.json
@@ -3,7 +3,7 @@
    "supportsSubScores": true,
    "ratings": [
        {
-            "ratingStrings": ["C", "E", "G", "TV-Y", "TV-G"],
+            "ratingStrings": ["E", "G", "TV-Y", "TV-G"],
            "ratingScore": {
                "score": 0,
                "subScore": 0
@@ -23,18 +23,11 @@
                "subScore": 1
            }
        },
-        {
-            "ratingStrings": ["C8"],
-            "ratingScore": {
-                "score": 8,
-                "subScore": 0
-            }
-        },
        {
            "ratingStrings": ["PG", "TV-PG"],
            "ratingScore": {
-                "score": 8,
-                "subScore": 1
+                "score": 9,
+                "subScore": 0
            }
        },
        {
@@ -45,7 +38,7 @@
            }
        },
        {
-            "ratingStrings": ["14+", "TV-14"],
+            "ratingStrings": ["TV-14"],
            "ratingScore": {
                "score": 14,
                "subScore": 1
--- a/Emby.Server.Implementations/Serialization/MyXmlSerializer.cs
+++ b/Emby.Server.Implementations/Serialization/MyXmlSerializer.cs
@@ -85,17 +85,9 @@ namespace Emby.Server.Implementations.Serialization
        /// <returns>System.Object.</returns>
        public object? DeserializeFromFile(Type type, string file)
        {
-            try
+            using (var stream = File.OpenRead(file))
            {
-                using (var stream = File.OpenRead(file))
-                {
-                    return DeserializeFromStream(type, stream);
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Data.Add("Filename", file);
-                throw;
+                return DeserializeFromStream(type, stream);
            }
        }

--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -973,7 +973,7 @@ namespace Emby.Server.Implementations.Session

            if (user.RememberAudioSelections)
            {
-                if (info.AudioStreamIndex.HasValue && data.AudioStreamIndex != info.AudioStreamIndex)
+                if (data.AudioStreamIndex != info.AudioStreamIndex)
                {
                    data.AudioStreamIndex = info.AudioStreamIndex;
                    changed = true;
@@ -990,7 +990,7 @@ namespace Emby.Server.Implementations.Session

            if (user.RememberSubtitleSelections)
            {
-                if (info.SubtitleStreamIndex.HasValue && data.SubtitleStreamIndex != info.SubtitleStreamIndex)
+                if (data.SubtitleStreamIndex != info.SubtitleStreamIndex)
                {
                    data.SubtitleStreamIndex = info.SubtitleStreamIndex;
                    changed = true;
@@ -1021,22 +1021,15 @@ namespace Emby.Server.Implementations.Session

            ArgumentNullException.ThrowIfNull(info);

+            if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(info), "The PlaybackStopInfo's PositionTicks was negative.");
+            }
+
            var session = GetSession(info.SessionId);

            session.StopAutomaticProgress();

-            if (info.PositionTicks.HasValue && info.PositionTicks.Value < 0)
-            {
-                // Ensure live stream is cleaned up before throwing, to prevent tuner
-                // resource leaks when stalled clients report a negative PositionTicks.
-                if (!string.IsNullOrEmpty(info.LiveStreamId))
-                {
-                    await CloseLiveStreamIfNeededAsync(info.LiveStreamId, session.Id).ConfigureAwait(false);
-                }
-
-                throw new ArgumentOutOfRangeException(nameof(info), "The PlaybackStopInfo's PositionTicks was negative.");
-            }
-
            var libraryItem = info.ItemId.IsEmpty()
                ? null
                : GetNowPlayingItem(session, info.ItemId);
@@ -2056,7 +2049,7 @@ namespace Emby.Server.Implementations.Session
        {
            CheckDisposed();

-            var adminUserIds = _userManager.GetUsers()
+            var adminUserIds = _userManager.Users
                .Where(i => i.HasPermission(PermissionKind.IsAdministrator))
                .Select(i => i.Id)
                .ToList();
--- a/Jellyfin.Api/Controllers/DashboardController.cs
+++ b/Jellyfin.Api/Controllers/DashboardController.cs
@@ -20,7 +20,6 @@ namespace Jellyfin.Api.Controllers;
 /// The dashboard controller.
 /// </summary>
 [Route("")]
-[Tags("Plugin")]
 public class DashboardController : BaseJellyfinApiController
 {
    private readonly ILogger<DashboardController> _logger;
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -196,7 +196,6 @@ public class InstantMixController : BaseJellyfinApiController
    /// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the playlist items.</returns>
    [HttpGet("MusicGenres/{name}/InstantMix")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Obsolete("Use GetInstantMixFromItem")]
    public ActionResult<QueryResult<BaseItemDto>> GetInstantMixFromMusicGenreByName(
        [FromRoute, Required] string name,
        [FromQuery] Guid? userId,
@@ -360,7 +359,7 @@ public class InstantMixController : BaseJellyfinApiController
    [HttpGet("MusicGenres/InstantMix")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Obsolete("Use GetInstantMixFromItem")]
+    [Obsolete("Use GetInstantMixFromMusicGenreByName")]
    public ActionResult<QueryResult<BaseItemDto>> GetInstantMixFromMusicGenreById(
        [FromQuery, Required] Guid id,
        [FromQuery] Guid? userId,
--- a/Jellyfin.Api/Controllers/ItemRefreshController.cs
+++ b/Jellyfin.Api/Controllers/ItemRefreshController.cs
@@ -20,7 +20,6 @@ namespace Jellyfin.Api.Controllers;
 /// </summary>
 [Route("Items")]
 [Authorize(Policy = Policies.RequiresElevation)]
-[Tags("Library")]
 public class ItemRefreshController : BaseJellyfinApiController
 {
    private readonly ILibraryManager _libraryManager;
--- a/Jellyfin.Api/Controllers/ItemUpdateController.cs
+++ b/Jellyfin.Api/Controllers/ItemUpdateController.cs
@@ -242,7 +242,6 @@ public class ItemUpdateController : BaseJellyfinApiController
        item.ForcedSortName = request.ForcedSortName;

        item.OriginalTitle = string.IsNullOrWhiteSpace(request.OriginalTitle) ? null : request.OriginalTitle;
-        item.OriginalLanguage = string.IsNullOrWhiteSpace(request.OriginalLanguage) ? null : request.OriginalLanguage;

        item.CriticRating = request.CriticRating;

--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -31,7 +31,7 @@ namespace Jellyfin.Api.Controllers;
 /// </summary>
 [Route("")]
 [Authorize]
-[Tags("Library")]
+[Tags("Item")]
 public class ItemsController : BaseJellyfinApiController
 {
    private readonly IUserManager _userManager;
@@ -955,7 +955,6 @@ public class ItemsController : BaseJellyfinApiController
    [HttpGet("UserItems/{itemId}/UserData")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Tags("UserData")]
    public ActionResult<UserItemDataDto?> GetItemUserData(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId)
@@ -1011,7 +1010,6 @@ public class ItemsController : BaseJellyfinApiController
    [HttpPost("UserItems/{itemId}/UserData")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Tags("UserData")]
    public ActionResult<UserItemDataDto?> UpdateItemUserData(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId,
--- a/Jellyfin.Api/Controllers/LiveTvController.cs
+++ b/Jellyfin.Api/Controllers/LiveTvController.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Net.Http;
 using System.Net.Mime;
 using System.Security.Cryptography;
 using System.Text;
@@ -17,6 +18,8 @@ using Jellyfin.Data.Enums;
 using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Common.Api;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
@@ -46,11 +49,12 @@ public class LiveTvController : BaseJellyfinApiController
    private readonly IListingsManager _listingsManager;
    private readonly IRecordingsManager _recordingsManager;
    private readonly IUserManager _userManager;
+    private readonly IHttpClientFactory _httpClientFactory;
    private readonly ILibraryManager _libraryManager;
    private readonly IDtoService _dtoService;
    private readonly IMediaSourceManager _mediaSourceManager;
+    private readonly IConfigurationManager _configurationManager;
    private readonly ITranscodeManager _transcodeManager;
-    private readonly ISchedulesDirectService _schedulesDirectService;

    /// <summary>
    /// Initializes a new instance of the <see cref="LiveTvController"/> class.
@@ -61,11 +65,12 @@ public class LiveTvController : BaseJellyfinApiController
    /// <param name="listingsManager">Instance of the <see cref="IListingsManager"/> interface.</param>
    /// <param name="recordingsManager">Instance of the <see cref="IRecordingsManager"/> interface.</param>
    /// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
+    /// <param name="httpClientFactory">Instance of the <see cref="IHttpClientFactory"/> interface.</param>
    /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
    /// <param name="dtoService">Instance of the <see cref="IDtoService"/> interface.</param>
    /// <param name="mediaSourceManager">Instance of the <see cref="IMediaSourceManager"/> interface.</param>
+    /// <param name="configurationManager">Instance of the <see cref="IConfigurationManager"/> interface.</param>
    /// <param name="transcodeManager">Instance of the <see cref="ITranscodeManager"/> interface.</param>
-    /// <param name="schedulesDirectService">Instance of the <see cref="ISchedulesDirectService"/> interface.</param>
    public LiveTvController(
        ILiveTvManager liveTvManager,
        IGuideManager guideManager,
@@ -73,11 +78,12 @@ public class LiveTvController : BaseJellyfinApiController
        IListingsManager listingsManager,
        IRecordingsManager recordingsManager,
        IUserManager userManager,
+        IHttpClientFactory httpClientFactory,
        ILibraryManager libraryManager,
        IDtoService dtoService,
        IMediaSourceManager mediaSourceManager,
-        ITranscodeManager transcodeManager,
-        ISchedulesDirectService schedulesDirectService)
+        IConfigurationManager configurationManager,
+        ITranscodeManager transcodeManager)
    {
        _liveTvManager = liveTvManager;
        _guideManager = guideManager;
@@ -85,11 +91,12 @@ public class LiveTvController : BaseJellyfinApiController
        _listingsManager = listingsManager;
        _recordingsManager = recordingsManager;
        _userManager = userManager;
+        _httpClientFactory = httpClientFactory;
        _libraryManager = libraryManager;
        _dtoService = dtoService;
        _mediaSourceManager = mediaSourceManager;
+        _configurationManager = configurationManager;
        _transcodeManager = transcodeManager;
-        _schedulesDirectService = schedulesDirectService;
    }

    /// <summary>
@@ -338,6 +345,20 @@ public class LiveTvController : BaseJellyfinApiController
    [Authorize(Policy = Policies.LiveTvAccess)]
    [Obsolete("This endpoint is obsolete.")]
    [ApiExplorerSettings(IgnoreApi = true)]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "channelId", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "userId", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "groupId", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "startIndex", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "limit", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "status", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "isInProgress", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "seriesTimerId", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "enableImages", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "imageTypeLimit", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "enableImageTypes", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "fields", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "enableUserData", Justification = "Imported from ServiceStack")]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "enableTotalRecordCount", Justification = "Imported from ServiceStack")]
    public ActionResult<QueryResult<BaseItemDto>> GetRecordingsSeries(
        [FromQuery] string? channelId,
        [FromQuery] Guid? userId,
@@ -368,6 +389,7 @@ public class LiveTvController : BaseJellyfinApiController
    [Authorize(Policy = Policies.LiveTvAccess)]
    [Obsolete("This endpoint is obsolete.")]
    [ApiExplorerSettings(IgnoreApi = true)]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "userId", Justification = "Imported from ServiceStack")]
    public ActionResult<QueryResult<BaseItemDto>> GetRecordingGroups([FromQuery] Guid? userId)
    {
        return new QueryResult<BaseItemDto>();
@@ -812,6 +834,7 @@ public class LiveTvController : BaseJellyfinApiController
    [HttpPost("Timers/{timerId}")]
    [Authorize(Policy = Policies.LiveTvManagement)]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "timerId", Justification = "Imported from ServiceStack")]
    public async Task<ActionResult> UpdateTimer([FromRoute, Required] string timerId, [FromBody] TimerInfoDto timerInfo)
    {
        await _liveTvManager.UpdateTimer(timerInfo, CancellationToken.None).ConfigureAwait(false);
@@ -901,6 +924,7 @@ public class LiveTvController : BaseJellyfinApiController
    [HttpPost("SeriesTimers/{timerId}")]
    [Authorize(Policy = Policies.LiveTvManagement)]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "timerId", Justification = "Imported from ServiceStack")]
    public async Task<ActionResult> UpdateSeriesTimer([FromRoute, Required] string timerId, [FromBody] SeriesTimerInfoDto seriesTimerInfo)
    {
        await _liveTvManager.UpdateSeriesTimer(seriesTimerInfo, CancellationToken.None).ConfigureAwait(false);
@@ -956,7 +980,9 @@ public class LiveTvController : BaseJellyfinApiController
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    public ActionResult DeleteTunerHost([FromQuery] string? id)
    {
-        _tunerHostManager.DeleteTunerHost(id);
+        var config = _configurationManager.GetConfiguration<LiveTvOptions>("livetv");
+        config.TunerHosts = config.TunerHosts.Where(i => !string.Equals(id, i.Id, StringComparison.OrdinalIgnoreCase)).ToArray();
+        _configurationManager.SaveConfiguration("livetv", config);
        return NoContent();
    }

@@ -1047,8 +1073,13 @@ public class LiveTvController : BaseJellyfinApiController
    [ProducesFile(MediaTypeNames.Application.Json)]
    public async Task<ActionResult> GetSchedulesDirectCountries()
    {
-        var stream = await _schedulesDirectService.GetAvailableCountries(CancellationToken.None).ConfigureAwait(false);
-        return File(stream, MediaTypeNames.Application.Json);
+        var client = _httpClientFactory.CreateClient(NamedClient.Default);
+        // https://json.schedulesdirect.org/20141201/available/countries
+        // Can't dispose the response as it's required up the call chain.
+        var response = await client.GetAsync(new Uri("https://json.schedulesdirect.org/20141201/available/countries"))
+            .ConfigureAwait(false);
+
+        return File(await response.Content.ReadAsStreamAsync().ConfigureAwait(false), MediaTypeNames.Application.Json);
    }

    /// <summary>
--- a/Jellyfin.Api/Controllers/PlaystateController.cs
+++ b/Jellyfin.Api/Controllers/PlaystateController.cs
@@ -72,7 +72,6 @@ public class PlaystateController : BaseJellyfinApiController
    [HttpPost("UserPlayedItems/{itemId}")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Tags("UserData")]
    public async Task<ActionResult<UserItemDataDto?>> MarkPlayedItem(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId,
@@ -139,7 +138,6 @@ public class PlaystateController : BaseJellyfinApiController
    [HttpDelete("UserPlayedItems/{itemId}")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Tags("UserData")]
    public async Task<ActionResult<UserItemDataDto?>> MarkUnplayedItem(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId)
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -432,7 +432,6 @@ public class SessionController : BaseJellyfinApiController
    /// <returns>An <see cref="IEnumerable{NameIdPair}"/> with the auth providers.</returns>
    [HttpGet("Auth/Providers")]
    [Authorize(Policy = Policies.RequiresElevation)]
-    [Tags("Authentication")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    public ActionResult<IEnumerable<NameIdPair>> GetAuthProviders()
    {
@@ -445,7 +444,6 @@ public class SessionController : BaseJellyfinApiController
    /// <response code="200">Password reset providers retrieved.</response>
    /// <returns>An <see cref="IEnumerable{NameIdPair}"/> with the password reset providers.</returns>
    [HttpGet("Auth/PasswordResetProviders")]
-    [Tags("Authentication")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [Authorize(Policy = Policies.RequiresElevation)]
    public ActionResult<IEnumerable<NameIdPair>> GetPasswordResetProviders()
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -1,6 +1,7 @@
-using System;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
+using Jellyfin.Api.Constants;
 using Jellyfin.Api.Models.StartupDtos;
 using MediaBrowser.Common.Api;
 using MediaBrowser.Common.Net;
@@ -53,7 +54,6 @@ public class StartupController : BaseJellyfinApiController
    /// <returns>An <see cref="OkResult"/> containing the initial startup wizard configuration.</returns>
    [HttpGet("Configuration")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Obsolete("Use configuration endpoints")]
    public ActionResult<StartupConfigurationDto> GetStartupConfiguration()
    {
        return new StartupConfigurationDto
@@ -73,7 +73,6 @@ public class StartupController : BaseJellyfinApiController
    /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
    [HttpPost("Configuration")]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [Obsolete("Use configuration endpoints")]
    public ActionResult UpdateInitialConfiguration([FromBody, Required] StartupConfigurationDto startupConfiguration)
    {
        _config.Configuration.ServerName = startupConfiguration.ServerName ?? string.Empty;
@@ -92,7 +91,6 @@ public class StartupController : BaseJellyfinApiController
    /// <returns>A <see cref="NoContentResult"/> indicating success.</returns>
    [HttpPost("RemoteAccess")]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [Obsolete("Use configuration endpoints")]
    public ActionResult SetRemoteAccess([FromBody, Required] StartupRemoteAccessDto startupRemoteAccessDto)
    {
        NetworkConfiguration settings = _config.GetNetworkConfiguration();
@@ -109,12 +107,11 @@ public class StartupController : BaseJellyfinApiController
    [HttpGet("User")]
    [HttpGet("FirstUser", Name = "GetFirstUser_2")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Obsolete("Use authentication endpoints")]
    public async Task<StartupUserDto> GetFirstUser()
    {
        // TODO: Remove this method when startup wizard no longer requires an existing user.
        await _userManager.InitializeAsync().ConfigureAwait(false);
-        var user = _userManager.GetFirstUser() ?? throw new InvalidOperationException("No user exists after initialization.");
+        var user = _userManager.Users.First();
        return new StartupUserDto
        {
            Name = user.Username
@@ -134,12 +131,7 @@ public class StartupController : BaseJellyfinApiController
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    public async Task<ActionResult> UpdateStartupUser([FromBody] StartupUserDto startupUserDto)
    {
-        var user = _userManager.GetFirstUser();
-        if (user is null)
-        {
-            return NotFound();
-        }
-
+        var user = _userManager.Users.First();
        if (string.IsNullOrWhiteSpace(startupUserDto.Password))
        {
            return BadRequest("Password must not be empty");
@@ -154,7 +146,7 @@ public class StartupController : BaseJellyfinApiController

        if (!string.IsNullOrEmpty(startupUserDto.Password))
        {
-            await _userManager.ChangePassword(user.Id, startupUserDto.Password).ConfigureAwait(false);
+            await _userManager.ChangePassword(user, startupUserDto.Password).ConfigureAwait(false);
        }

        return NoContent();
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -208,7 +208,6 @@ public class UserController : BaseJellyfinApiController
    /// <returns>A <see cref="Task"/> containing an <see cref="AuthenticationRequest"/> with information about the new session.</returns>
    [HttpPost("AuthenticateByName")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("Authentication")]
    public async Task<ActionResult<AuthenticationResult>> AuthenticateUserByName([FromBody, Required] AuthenticateUserByName request)
    {
        var auth = await _authContext.GetAuthorizationInfo(Request).ConfigureAwait(false);
@@ -244,7 +243,6 @@ public class UserController : BaseJellyfinApiController
    /// <returns>A <see cref="Task"/> containing an <see cref="AuthenticationRequest"/> with information about the new session.</returns>
    [HttpPost("AuthenticateWithQuickConnect")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("Authentication")]
    public ActionResult<AuthenticationResult> AuthenticateWithQuickConnect([FromBody, Required] QuickConnectDto request)
    {
        try
@@ -290,7 +288,7 @@ public class UserController : BaseJellyfinApiController

        if (request.ResetPassword)
        {
-            await _userManager.ResetPassword(user.Id).ConfigureAwait(false);
+            await _userManager.ResetPassword(user).ConfigureAwait(false);
        }
        else
        {
@@ -308,7 +306,7 @@ public class UserController : BaseJellyfinApiController
                }
            }

-            await _userManager.ChangePassword(user.Id, request.NewPw ?? string.Empty).ConfigureAwait(false);
+            await _userManager.ChangePassword(user, request.NewPw ?? string.Empty).ConfigureAwait(false);

            var currentToken = User.GetToken();

@@ -371,7 +369,7 @@ public class UserController : BaseJellyfinApiController

        if (!string.Equals(user.Username, updateUser.Name, StringComparison.Ordinal))
        {
-            await _userManager.RenameUser(user.Id, user.Username, updateUser.Name).ConfigureAwait(false);
+            await _userManager.RenameUser(user, updateUser.Name).ConfigureAwait(false);
        }

        await _userManager.UpdateConfigurationAsync(requestUserId, updateUser.Configuration).ConfigureAwait(false);
@@ -427,7 +425,7 @@ public class UserController : BaseJellyfinApiController
        // If removing admin access
        if (!newPolicy.IsAdministrator && user.HasPermission(PermissionKind.IsAdministrator))
        {
-            if (_userManager.GetUsers().Count(i => i.HasPermission(PermissionKind.IsAdministrator)) == 1)
+            if (_userManager.Users.Count(i => i.HasPermission(PermissionKind.IsAdministrator)) == 1)
            {
                return StatusCode(StatusCodes.Status403Forbidden, "There must be at least one user in the system with administrative access.");
            }
@@ -442,7 +440,7 @@ public class UserController : BaseJellyfinApiController
        // If disabling
        if (newPolicy.IsDisabled && !user.HasPermission(PermissionKind.IsDisabled))
        {
-            if (_userManager.GetUsers().Count(i => !i.HasPermission(PermissionKind.IsDisabled)) == 1)
+            if (_userManager.Users.Count(i => !i.HasPermission(PermissionKind.IsDisabled)) == 1)
            {
                return StatusCode(StatusCodes.Status403Forbidden, "There must be at least one enabled user in the system.");
            }
@@ -524,7 +522,7 @@ public class UserController : BaseJellyfinApiController
        // no need to authenticate password for new user
        if (request.Password is not null)
        {
-            await _userManager.ChangePassword(newUser.Id, request.Password).ConfigureAwait(false);
+            await _userManager.ChangePassword(newUser, request.Password).ConfigureAwait(false);
        }

        var result = _userManager.GetUserDto(newUser, HttpContext.GetNormalizedRemoteIP().ToString());
@@ -540,7 +538,6 @@ public class UserController : BaseJellyfinApiController
    /// <returns>A <see cref="Task"/> containing a <see cref="ForgotPasswordResult"/>.</returns>
    [HttpPost("ForgotPassword")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("Authentication")]
    public async Task<ActionResult<ForgotPasswordResult>> ForgotPassword([FromBody, Required] ForgotPasswordDto forgotPasswordRequest)
    {
        var ip = HttpContext.GetNormalizedRemoteIP();
@@ -565,7 +562,6 @@ public class UserController : BaseJellyfinApiController
    /// <returns>A <see cref="Task"/> containing a <see cref="PinRedeemResult"/>.</returns>
    [HttpPost("ForgotPassword/Pin")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("Authentication")]
    public async Task<ActionResult<PinRedeemResult>> ForgotPasswordPin([FromBody, Required] ForgotPasswordPinDto forgotPasswordPinRequest)
    {
        var result = await _userManager.RedeemPasswordResetPin(forgotPasswordPinRequest.Pin).ConfigureAwait(false);
@@ -601,7 +597,7 @@ public class UserController : BaseJellyfinApiController

    private IEnumerable<UserDto> Get(bool? isHidden, bool? isDisabled, bool filterByDevice, bool filterByNetwork)
    {
-        var users = _userManager.GetUsers();
+        var users = _userManager.Users;

        if (isDisabled.HasValue)
        {
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -31,7 +31,6 @@ namespace Jellyfin.Api.Controllers;
 /// </summary>
 [Route("")]
 [Authorize]
-[Tags("Library")]
 public class UserLibraryController : BaseJellyfinApiController
 {
    private readonly IUserManager _userManager;
@@ -213,7 +212,6 @@ public class UserLibraryController : BaseJellyfinApiController
    /// <returns>An <see cref="OkResult"/> containing the <see cref="UserItemDataDto"/>.</returns>
    [HttpPost("UserFavoriteItems/{itemId}")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("UserData")]
    public ActionResult<UserItemDataDto> MarkFavoriteItem(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId)
@@ -261,7 +259,6 @@ public class UserLibraryController : BaseJellyfinApiController
    /// <returns>An <see cref="OkResult"/> containing the <see cref="UserItemDataDto"/>.</returns>
    [HttpDelete("UserFavoriteItems/{itemId}")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("UserData")]
    public ActionResult<UserItemDataDto> UnmarkFavoriteItem(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId)
@@ -309,7 +306,6 @@ public class UserLibraryController : BaseJellyfinApiController
    /// <returns>An <see cref="OkResult"/> containing the <see cref="UserItemDataDto"/>.</returns>
    [HttpDelete("UserItems/{itemId}/Rating")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("UserData")]
    public ActionResult<UserItemDataDto?> DeleteUserItemRating(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId)
@@ -358,7 +354,6 @@ public class UserLibraryController : BaseJellyfinApiController
    /// <returns>An <see cref="OkResult"/> containing the <see cref="UserItemDataDto"/>.</returns>
    [HttpPost("UserItems/{itemId}/Rating")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    [Tags("UserData")]
    public ActionResult<UserItemDataDto?> UpdateUserItemRating(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId,
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -18,7 +18,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>12.0.0</VersionPrefix>
+    <VersionPrefix>10.12.0</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs
@@ -68,7 +68,6 @@ internal static class BaseItemMapper
        dto.CriticRating = entity.CriticRating;
        dto.PresentationUniqueKey = entity.PresentationUniqueKey;
        dto.OriginalTitle = entity.OriginalTitle;
-        dto.OriginalLanguage = entity.OriginalLanguage;
        dto.Album = entity.Album;
        dto.LUFS = entity.LUFS;
        dto.NormalizationGain = entity.NormalizationGain;
@@ -244,7 +243,6 @@ internal static class BaseItemMapper
        entity.CriticRating = dto.CriticRating;
        entity.PresentationUniqueKey = dto.PresentationUniqueKey;
        entity.OriginalTitle = dto.OriginalTitle;
-        entity.OriginalLanguage = dto.OriginalLanguage;
        entity.Album = dto.Album;
        entity.LUFS = dto.LUFS;
        entity.NormalizationGain = dto.NormalizationGain;
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.ByName.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.ByName.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Jellyfin.Data.Enums;
 using Jellyfin.Database.Implementations.Entities;
+using Jellyfin.Extensions;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -169,40 +170,92 @@ public sealed partial class BaseItemRepository
            ExcludeItemIds = filter.ExcludeItemIds
        };

-        // Collapse rows that share a PresentationUniqueKey (e.g. alternate versions) by picking
-        // the lowest Id per group. Keep as an IQueryable sub-select so paging is applied AFTER
-        // ApplyOrder runs the caller's actual sort.
+        // Build the master query and collapse rows that share a PresentationUniqueKey
+        // (e.g. alternate versions) by picking the lowest Id per group.
        var masterQuery = TranslateQuery(innerQuery, context, outerQueryFilter);
-        var representativeIds = masterQuery
+
+        var orderedMasterQuery = ApplyOrder(masterQuery, filter, context)
            .GroupBy(e => e.PresentationUniqueKey)
            .Select(g => g.Min(e => e.Id));

        var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
        if (filter.EnableTotalRecordCount)
        {
-            result.TotalRecordCount = representativeIds.Count();
+            result.TotalRecordCount = orderedMasterQuery.Count();
        }

-        var query = ApplyNavigations(
-                context.BaseItems.AsNoTracking().AsSingleQuery().Where(e => representativeIds.Contains(e.Id)),
-                filter);
-
-        query = ApplyOrder(query, filter, context);
-
        if (filter.StartIndex.HasValue && filter.StartIndex.Value > 0)
        {
-            query = query.Skip(filter.StartIndex.Value);
+            orderedMasterQuery = orderedMasterQuery.Skip(filter.StartIndex.Value);
        }

        if (filter.Limit.HasValue)
        {
-            query = query.Take(filter.Limit.Value);
+            orderedMasterQuery = orderedMasterQuery.Take(filter.Limit.Value);
        }

-        result.StartIndex = filter.StartIndex ?? 0;
+        var masterIds = orderedMasterQuery.ToList();
+
+        var query = ApplyNavigations(
+                context.BaseItems.AsNoTracking().AsSingleQuery().Where(e => masterIds.Contains(e.Id)),
+                filter);
+
+        query = ApplyOrder(query, filter, context);
+
        if (filter.IncludeItemTypes.Length > 0)
        {
-            var countsByCleanName = BuildItemCountsByCleanName(context, filter, itemValueTypes);
+            var typeSubQuery = new InternalItemsQuery(filter.User)
+            {
+                ExcludeItemTypes = filter.ExcludeItemTypes,
+                IncludeItemTypes = filter.IncludeItemTypes,
+                MediaTypes = filter.MediaTypes,
+                AncestorIds = filter.AncestorIds,
+                ExcludeItemIds = filter.ExcludeItemIds,
+                ItemIds = filter.ItemIds,
+                TopParentIds = filter.TopParentIds,
+                ParentId = filter.ParentId,
+                IsPlayed = filter.IsPlayed
+            };
+
+            var itemCountQuery = TranslateQuery(context.BaseItems.AsNoTracking().Where(e => e.Id != EF.Constant(PlaceholderId)), context, typeSubQuery)
+                .Where(e => e.ItemValues!.Any(f => itemValueTypes!.Contains(f.ItemValue.Type)));
+
+            var seriesTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Series];
+            var movieTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Movie];
+            var episodeTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Episode];
+            var musicAlbumTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum];
+            var musicArtistTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist];
+            var audioTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Audio];
+            var trailerTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Trailer];
+            var itemIds = itemCountQuery.Select(e => e.Id);
+
+            // Rewrite query to avoid SelectMany on navigation properties (which requires SQL APPLY, not supported on SQLite)
+            // Instead, start from ItemValueMaps and join with BaseItems
+            var countsByCleanName = context.ItemValuesMap
+                .Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type))
+                .Where(ivm => itemIds.Contains(ivm.ItemId))
+                .Join(
+                    context.BaseItems,
+                    ivm => ivm.ItemId,
+                    e => e.Id,
+                    (ivm, e) => new { CleanName = ivm.ItemValue.CleanValue, e.Type })
+                .GroupBy(x => new { x.CleanName, x.Type })
+                .Select(g => new { g.Key.CleanName, g.Key.Type, Count = g.Count() })
+                .GroupBy(x => x.CleanName)
+                .ToDictionary(
+                    g => g.Key,
+                    g => new ItemCounts
+                    {
+                        SeriesCount = g.Where(x => x.Type == seriesTypeName).Sum(x => x.Count),
+                        EpisodeCount = g.Where(x => x.Type == episodeTypeName).Sum(x => x.Count),
+                        MovieCount = g.Where(x => x.Type == movieTypeName).Sum(x => x.Count),
+                        AlbumCount = g.Where(x => x.Type == musicAlbumTypeName).Sum(x => x.Count),
+                        ArtistCount = g.Where(x => x.Type == musicArtistTypeName).Sum(x => x.Count),
+                        SongCount = g.Where(x => x.Type == audioTypeName).Sum(x => x.Count),
+                        TrailerCount = g.Where(x => x.Type == trailerTypeName).Sum(x => x.Count),
+                    });
+
+            result.StartIndex = filter.StartIndex ?? 0;
            result.Items =
            [
                .. query
@@ -220,6 +273,7 @@ public sealed partial class BaseItemRepository
        }
        else
        {
+            result.StartIndex = filter.StartIndex ?? 0;
            result.Items =
            [
                .. query
@@ -233,61 +287,4 @@ public sealed partial class BaseItemRepository

        return result;
    }
-
-    private Dictionary<string, ItemCounts> BuildItemCountsByCleanName(
-        Database.Implementations.JellyfinDbContext context,
-        InternalItemsQuery filter,
-        IReadOnlyList<ItemValueType> itemValueTypes)
-    {
-        var typeSubQuery = new InternalItemsQuery(filter.User)
-        {
-            ExcludeItemTypes = filter.ExcludeItemTypes,
-            IncludeItemTypes = filter.IncludeItemTypes,
-            MediaTypes = filter.MediaTypes,
-            AncestorIds = filter.AncestorIds,
-            ExcludeItemIds = filter.ExcludeItemIds,
-            ItemIds = filter.ItemIds,
-            TopParentIds = filter.TopParentIds,
-            ParentId = filter.ParentId,
-            IsPlayed = filter.IsPlayed
-        };
-
-        var itemCountQuery = TranslateQuery(context.BaseItems.AsNoTracking().Where(e => e.Id != EF.Constant(PlaceholderId)), context, typeSubQuery)
-            .Where(e => e.ItemValues!.Any(f => itemValueTypes!.Contains(f.ItemValue.Type)));
-
-        var seriesTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Series];
-        var movieTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Movie];
-        var episodeTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Episode];
-        var musicAlbumTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum];
-        var musicArtistTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist];
-        var audioTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Audio];
-        var trailerTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Trailer];
-        var itemIds = itemCountQuery.Select(e => e.Id);
-
-        // Rewrite query to avoid SelectMany on navigation properties (which requires SQL APPLY, not supported on SQLite)
-        // Instead, start from ItemValueMaps and join with BaseItems
-        return context.ItemValuesMap
-            .Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type))
-            .Where(ivm => itemIds.Contains(ivm.ItemId))
-            .Join(
-                context.BaseItems,
-                ivm => ivm.ItemId,
-                e => e.Id,
-                (ivm, e) => new { CleanName = ivm.ItemValue.CleanValue, e.Type })
-            .GroupBy(x => new { x.CleanName, x.Type })
-            .Select(g => new { g.Key.CleanName, g.Key.Type, Count = g.Count() })
-            .GroupBy(x => x.CleanName)
-            .ToDictionary(
-                g => g.Key,
-                g => new ItemCounts
-                {
-                    SeriesCount = g.Where(x => x.Type == seriesTypeName).Sum(x => x.Count),
-                    EpisodeCount = g.Where(x => x.Type == episodeTypeName).Sum(x => x.Count),
-                    MovieCount = g.Where(x => x.Type == movieTypeName).Sum(x => x.Count),
-                    AlbumCount = g.Where(x => x.Type == musicAlbumTypeName).Sum(x => x.Count),
-                    ArtistCount = g.Where(x => x.Type == musicArtistTypeName).Sum(x => x.Count),
-                    SongCount = g.Where(x => x.Type == audioTypeName).Sum(x => x.Count),
-                    TrailerCount = g.Where(x => x.Type == trailerTypeName).Sum(x => x.Count),
-                });
-    }
 }
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.Querying.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.Querying.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
 using Jellyfin.Database.Implementations;
@@ -124,53 +125,45 @@ public sealed partial class BaseItemRepository
            return GetLatestTvShowItems(context, baseQuery, filter, limit);
        }

+        // Find the top N group keys ordered by most recent DateCreated.
+        // Movies group by PresentationUniqueKey (alternate versions like 4K/1080p share a key).
+        // Music groups by Album.
+        Expression<Func<BaseItemEntity, bool>> groupKeyFilter;
+        Expression<Func<BaseItemEntity, string?>> groupKeySelector;
+
        if (collectionType is CollectionType.movies)
        {
-            // Group by PresentationUniqueKey, pick the newest item per group.
-            var topGroupItems = baseQuery
-                .Where(e => e.PresentationUniqueKey != null)
-                .GroupBy(e => e.PresentationUniqueKey)
-                .Select(g => new
-                {
-                    MaxDate = g.Max(e => e.DateCreated),
-                    FirstId = g.OrderByDescending(e => e.DateCreated).ThenByDescending(e => e.Id).Select(e => e.Id).First()
-                })
-                .OrderByDescending(g => g.MaxDate);
-
-            var firstIdsQuery = filter.Limit.HasValue
-                ? topGroupItems.Take(filter.Limit.Value).Select(g => g.FirstId)
-                : topGroupItems.Select(g => g.FirstId);
-
-            return LoadLatestByIds(context, firstIdsQuery, filter);
+            groupKeyFilter = e => e.PresentationUniqueKey != null;
+            groupKeySelector = e => e.PresentationUniqueKey;
+        }
+        else
+        {
+            groupKeyFilter = e => e.Album != null;
+            groupKeySelector = e => e.Album;
        }

-        // Albums whose Id is the parent of any track matching the user's filter.
-        var albumIdsWithMatchingTrack = context.AncestorIds
-            .Join(baseQuery, ai => ai.ItemId, t => t.Id, (ai, _) => ai.ParentItemId);
+        // Group by GroupKey, pick the latest item per group (correlated subquery: ORDER BY DateCreated DESC, Id DESC LIMIT 1),
+        // order groups by group max date, take the top N — all in a single SQL statement.
+        // ThenByDescending(Id) is the tiebreaker for deterministic ordering when items share a DateCreated.
+        var topGroupItems = baseQuery
+            .Where(groupKeyFilter)
+            .GroupBy(groupKeySelector)
+            .Select(g => new
+            {
+                MaxDate = g.Max(e => e.DateCreated),
+                FirstId = g.OrderByDescending(e => e.DateCreated).ThenByDescending(e => e.Id).Select(e => e.Id).First()
+            })
+            .OrderByDescending(g => g.MaxDate);

-        var musicAlbumTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum]!;
-        var topAlbumsQuery = context.BaseItems.AsNoTracking()
-            .Where(album => album.Type == musicAlbumTypeName)
-            .Where(album => albumIdsWithMatchingTrack.Contains(album.Id))
-            .OrderByDescending(album => album.DateCreated)
-            .ThenByDescending(album => album.Id);
+        var firstIdsQuery = filter.Limit.HasValue
+            ? topGroupItems.Take(filter.Limit.Value).Select(g => g.FirstId)
+            : topGroupItems.Select(g => g.FirstId);

-        var albumIdsQuery = filter.Limit.HasValue
-            ? topAlbumsQuery.Take(filter.Limit.Value).Select(a => a.Id)
-            : topAlbumsQuery.Select(a => a.Id);
+        var firstIds = firstIdsQuery.ToList();

-        return LoadLatestByIds(context, albumIdsQuery, filter);
-    }
-
-    // Keeping idsQuery deferred lets EF emit `WHERE Id IN (<subquery>)`.
-    private IReadOnlyList<BaseItemDto> LoadLatestByIds(
-        JellyfinDbContext context,
-        IQueryable<Guid> idsQuery,
-        InternalItemsQuery filter)
-    {
-        var itemsQuery = ApplyNavigations(
-            context.BaseItems.AsNoTracking().Where(e => idsQuery.Contains(e.Id)),
-            filter);
+        // Single bound JSON / array parameter via WhereOneOrMany — keeps SQL small regardless of N.
+        var itemsQuery = context.BaseItems.AsNoTracking().WhereOneOrMany(firstIds, e => e.Id);
+        itemsQuery = ApplyNavigations(itemsQuery, filter);

        return itemsQuery
            .OrderByDescending(e => e.DateCreated)
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
@@ -390,8 +390,7 @@ public sealed partial class BaseItemRepository
        {
            if (filter.UseRawName == true)
            {
-                var nameLower = filter.Name.ToLowerInvariant();
-                baseQuery = baseQuery.Where(e => e.Name!.ToLower() == nameLower);
+                baseQuery = baseQuery.Where(e => e.Name == filter.Name);
            }
            else
            {
--- a/Jellyfin.Server.Implementations/Item/LinkedChildrenService.cs
+++ b/Jellyfin.Server.Implementations/Item/LinkedChildrenService.cs
@@ -1,6 +1,4 @@
 #pragma warning disable RS0030 // Do not use banned APIs
-#pragma warning disable CA1304 // Specify CultureInfo
-#pragma warning disable CA1311 // Specify a culture or use an invariant version

 using System;
 using System.Collections.Generic;
@@ -64,19 +62,17 @@ public class LinkedChildrenService : ILinkedChildrenService
    {
        using var dbContext = _dbProvider.CreateDbContext();

-        var lowerNames = artistNames.Select(n => n.ToLowerInvariant()).ToArray();
        var artists = dbContext.BaseItems
            .AsNoTracking()
            .Where(e => e.Type == _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!)
-            .Where(e => lowerNames.Contains(e.Name!.ToLower()))
+            .Where(e => artistNames.Contains(e.Name))
            .ToArray();

        var lookup = artists
-            .GroupBy(e => e.Name!, StringComparer.OrdinalIgnoreCase)
+            .GroupBy(e => e.Name!)
            .ToDictionary(
                g => g.Key,
-                g => g.Select(f => _queryHelpers.DeserializeBaseItem(f)).Where(dto => dto is not null).Cast<MusicArtist>().ToArray(),
-                StringComparer.OrdinalIgnoreCase);
+                g => g.Select(f => _queryHelpers.DeserializeBaseItem(f)).Where(dto => dto is not null).Cast<MusicArtist>().ToArray());

        var result = new Dictionary<string, MusicArtist[]>(artistNames.Count);
        foreach (var name in artistNames)
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -123,7 +123,6 @@ public class MediaStreamRepository : IMediaStreamRepository
        dto.IsDefault = entity.IsDefault;
        dto.IsForced = entity.IsForced;
        dto.IsExternal = entity.IsExternal;
-        dto.IsOriginal = entity.IsOriginal;
        dto.Height = entity.Height;
        dto.Width = entity.Width;
        dto.AverageFrameRate = entity.AverageFrameRate;
@@ -165,11 +164,6 @@ public class MediaStreamRepository : IMediaStreamRepository
                dto.LocalizedLanguage = culture?.DisplayName;
            }

-            if (dto.Type is MediaStreamType.Audio)
-            {
-                dto.LocalizedOriginal = _localization.GetLocalizedString("Original");
-            }
-
            if (dto.Type is MediaStreamType.Subtitle)
            {
                dto.LocalizedUndefined = _localization.GetLocalizedString("Undefined");
@@ -204,7 +198,6 @@ public class MediaStreamRepository : IMediaStreamRepository
            IsDefault = dto.IsDefault,
            IsForced = dto.IsForced,
            IsExternal = dto.IsExternal,
-            IsOriginal = dto.IsOriginal,
            Height = dto.Height,
            Width = dto.Width,
            AverageFrameRate = dto.AverageFrameRate,
--- a/Jellyfin.Server.Implementations/Item/NextUpService.cs
+++ b/Jellyfin.Server.Implementations/Item/NextUpService.cs
@@ -127,21 +127,15 @@ public class NextUpService : INextUpService
                .AsNoTracking()
                .Where(e => e.Type == episodeTypeName)
                .Where(e => e.SeriesPresentationUniqueKey != null && seriesKeys.Contains(e.SeriesPresentationUniqueKey))
-                .Where(e => e.ParentIndexNumber != 0);
+                .Where(e => e.ParentIndexNumber != 0)
+                .Where(e => e.UserData!.Any(ud => ud.UserId == userId && ud.Played));
            lastWatchedByDateBase = _queryHelpers.ApplyAccessFiltering(context, lastWatchedByDateBase, filter);

-            // Use an explicit Join (INNER JOIN) instead of SelectMany on a collection navigation.
-            // SelectMany on UserData with a correlated Where would translate to APPLY,
-            // which SQLite does not support.
+            // Use lightweight projection + client-side grouping instead of
+            // SelectMany+GroupBy+OrderByDescending+FirstOrDefault (correlated subquery).
            var playedWithDates = lastWatchedByDateBase
-                .Join(
-                    context.UserData
-                        .AsNoTracking()
-                        .Where(ud => ud.ItemId != EF.Constant(BaseItemRepository.PlaceholderId))
-                        .Where(ud => ud.Played),
-                    e => new { UserId = userId, ItemId = e.Id },
-                    ud => new { ud.UserId, ud.ItemId },
-                    (e, ud) => new { EpisodeId = e.Id, e.SeriesPresentationUniqueKey, ud.LastPlayedDate })
+                .SelectMany(e => e.UserData!.Where(ud => ud.UserId == userId && ud.Played)
+                    .Select(ud => new { EpisodeId = e.Id, e.SeriesPresentationUniqueKey, ud.LastPlayedDate }))
                .ToList();

            foreach (var group in playedWithDates.GroupBy(x => x.SeriesPresentationUniqueKey))
--- a/Jellyfin.Server.Implementations/Item/OrderMapper.cs
+++ b/Jellyfin.Server.Implementations/Item/OrderMapper.cs
@@ -48,9 +48,9 @@ public static class OrderMapper
            (ItemSortBy.SeriesSortName, _) => e => e.SeriesName,
            (ItemSortBy.Album, _) => e => e.Album,
            (ItemSortBy.DateCreated, _) => e => e.DateCreated,
-            (ItemSortBy.PremiereDate, _) => e => e.PremiereDate ?? (e.ProductionYear.HasValue ? DateTime.MinValue.AddYears(e.ProductionYear.Value - 1) : null),
+            (ItemSortBy.PremiereDate, _) => e => (e.PremiereDate ?? (e.ProductionYear.HasValue ? DateTime.MinValue.AddYears(e.ProductionYear.Value - 1) : null)),
            (ItemSortBy.StartDate, _) => e => e.StartDate,
-            (ItemSortBy.Name, _) => e => e.SortName,
+            (ItemSortBy.Name, _) => e => e.CleanName,
            (ItemSortBy.CommunityRating, _) => e => e.CommunityRating,
            (ItemSortBy.ProductionYear, _) => e => e.ProductionYear,
            (ItemSortBy.CriticRating, _) => e => e.CriticRating,
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -44,16 +44,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
        }
        else
        {
-            // The Peoples table has one row per (Name, PersonType), so the same person can
-            // appear multiple times (e.g. as Actor and GuestStar). Collapse to one row per
-            // name so /Persons doesn't return the same BaseItem id repeatedly. Lowercase the
-            // grouping key so case-only duplicates collapse together.
-            var representativeIds = dbQuery
-                .GroupBy(e => e.Name.ToLower())
-                .Select(g => g.Min(e => e.Id));
-            dbQuery = context.Peoples.AsNoTracking()
-                .Where(p => representativeIds.Contains(p.Id))
-                .OrderBy(e => e.Name);
+            dbQuery = dbQuery.OrderBy(e => e.Name);
        }

        var count = dbQuery.Count();
@@ -103,16 +94,16 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
            person.Role = person.Role?.Trim() ?? string.Empty;
        }

-        // multiple metadata providers can provide the _same_ person; dedupe case-insensitively.
-        people = people.DistinctBy(e => e.Name.ToLowerInvariant() + "-" + e.Type).ToArray();
-        var personKeys = people.Select(e => e.Name.ToLowerInvariant() + "-" + e.Type).ToArray();
+        // 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.ToLower() + "-" + e.PersonType
+                SelectionKey = e.Name + "-" + e.PersonType
            })
            .Where(p => personKeys.Contains(p.SelectionKey))
            .Select(f => f.item)
@@ -120,7 +111,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I

        var toAdd = people
            .Where(e => e.Type is not PersonKind.Artist && e.Type is not PersonKind.AlbumArtist)
-            .Where(e => !existingPersons.Any(f => string.Equals(f.Name, e.Name, StringComparison.OrdinalIgnoreCase) && f.PersonType == e.Type.ToString()))
+            .Where(e => !existingPersons.Any(f => f.Name == e.Name && f.PersonType == e.Type.ToString()))
            .Select(Map);
        context.Peoples.AddRange(toAdd);
        context.SaveChanges();
@@ -138,8 +129,8 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
                continue;
            }

-            var entityPerson = personsEntities.First(e => string.Equals(e.Name, person.Name, StringComparison.OrdinalIgnoreCase) && e.PersonType == person.Type.ToString());
-            var existingMap = existingMaps.FirstOrDefault(e => string.Equals(e.People.Name, person.Name, StringComparison.OrdinalIgnoreCase) && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
+            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()
@@ -240,7 +231,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I

        if (queryExcludePersonTypes.Count > 0)
        {
-            query = query.Where(e => !queryExcludePersonTypes.Contains(e.PersonType));
+            query = query.Where(e => !queryPersonTypes.Contains(e.PersonType));
        }

        if (filter.MaxListOrder.HasValue && !filter.ItemId.IsEmpty())
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -54,7 +54,7 @@ public class MediaSegmentManager : IMediaSegmentManager
    public async Task RunSegmentPluginProviders(BaseItem baseItem, LibraryOptions libraryOptions, bool forceOverwrite, CancellationToken cancellationToken)
    {
        var providers = _segmentProviders
-            .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(e.Name, StringComparer.OrdinalIgnoreCase))
+            .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(GetProviderId(e.Name)))
            .OrderBy(i =>
                {
                    var index = libraryOptions.MediaSegmentProviderOrder.IndexOf(i.Name);
@@ -224,7 +224,7 @@ public class MediaSegmentManager : IMediaSegmentManager
            if (filterByProvider)
            {
                var providerIds = _segmentProviders
-                    .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(e.Name, StringComparer.OrdinalIgnoreCase))
+                    .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(GetProviderId(e.Name)))
                    .Select(f => GetProviderId(f.Name))
                    .ToArray();
                if (providerIds.Length == 0)
--- a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
+++ b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
@@ -198,13 +198,13 @@ public class TrickplayManager : ITrickplayManager
            // Cleanup old trickplay files
            if (Directory.Exists(trickplayDirectory))
            {
-                var existingFolders = Directory.GetDirectories(trickplayDirectory);
+                var existingFolders = Directory.GetDirectories(trickplayDirectory).ToList();
                var trickplayInfos = await dbContext.TrickplayInfos
                        .AsNoTracking()
                        .Where(i => i.ItemId.Equals(video.Id))
                        .ToListAsync(cancellationToken)
                        .ConfigureAwait(false);
-                var expectedFolders = trickplayInfos.Select(i => GetTrickplayDirectory(video, i.TileWidth, i.TileHeight, i.Width, saveWithMedia));
+                var expectedFolders = trickplayInfos.Select(i => GetTrickplayDirectory(video, i.TileWidth, i.TileHeight, i.Width, saveWithMedia)).ToList();
                var foldersToRemove = existingFolders.Except(expectedFolders);
                foreach (var folder in foldersToRemove)
                {
--- a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
@@ -74,7 +74,7 @@ namespace Jellyfin.Server.Implementations.Users
                    var resetUser = userManager.GetUserByName(spr.UserName)
                        ?? throw new ResourceNotFoundException($"User with a username of {spr.UserName} not found");

-                    await userManager.ChangePassword(resetUser.Id, pin).ConfigureAwait(false);
+                    await userManager.ChangePassword(resetUser, pin).ConfigureAwait(false);
                    usersReset.Add(resetUser.Username);
                    File.Delete(resetFile);
                }
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -1,14 +1,12 @@
 #pragma warning disable CA1307
-#pragma warning disable RS0030 // Do not use banned APIs

 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
-using AsyncKeyedLock;
 using Jellyfin.Data;
 using Jellyfin.Data.Enums;
 using Jellyfin.Data.Events;
@@ -37,7 +35,7 @@ namespace Jellyfin.Server.Implementations.Users
    /// <summary>
    /// Manages the creation and retrieval of <see cref="User"/> instances.
    /// </summary>
-    public partial class UserManager : IUserManager, IDisposable
+    public partial class UserManager : IUserManager
    {
        private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
        private readonly IEventManager _eventManager;
@@ -52,7 +50,7 @@ namespace Jellyfin.Server.Implementations.Users
        private readonly DefaultPasswordResetProvider _defaultPasswordResetProvider;
        private readonly IServerConfigurationManager _serverConfigurationManager;

-        private readonly AsyncKeyedLocker<Guid> _userLock = new();
+        private readonly IDictionary<Guid, User> _users;

        /// <summary>
        /// Initializes a new instance of the <see cref="UserManager"/> class.
@@ -91,28 +89,29 @@ namespace Jellyfin.Server.Implementations.Users
            _invalidAuthProvider = _authenticationProviders.OfType<InvalidAuthProvider>().First();
            _defaultAuthenticationProvider = _authenticationProviders.OfType<DefaultAuthenticationProvider>().First();
            _defaultPasswordResetProvider = _passwordResetProviders.OfType<DefaultPasswordResetProvider>().First();
+
+            _users = new ConcurrentDictionary<Guid, User>();
+            using var dbContext = _dbProvider.CreateDbContext();
+            foreach (var user in dbContext.Users
+                .AsSingleQuery()
+                .Include(user => user.Permissions)
+                .Include(user => user.Preferences)
+                .Include(user => user.AccessSchedules)
+                .Include(user => user.ProfileImage)
+                .AsEnumerable())
+            {
+                _users.Add(user.Id, user);
+            }
        }

        /// <inheritdoc/>
        public event EventHandler<GenericEventArgs<User>>? OnUserUpdated;

        /// <inheritdoc/>
-        public IEnumerable<User> GetUsers()
-        {
-            using var dbContext = _dbProvider.CreateDbContext();
-            return UserQuery(dbContext)
-                .ToArray();
-        }
+        public IEnumerable<User> Users => _users.Values;

        /// <inheritdoc/>
-        public IEnumerable<Guid> GetUsersIds()
-        {
-            using var dbContext = _dbProvider.CreateDbContext();
-            return dbContext.Users
-                .AsNoTracking()
-                .Select(user => user.Id)
-                .ToArray();
-        }
+        public IEnumerable<Guid> UsersIds => _users.Keys;

        // This is some regex that matches only on unicode "word" characters, as well as -, _ and @
        // In theory this will cut out most if not all 'control' characters which should help minimize any weirdness
@@ -128,27 +127,8 @@ namespace Jellyfin.Server.Implementations.Users
                throw new ArgumentException("Guid can't be empty", nameof(id));
            }

-            using var dbContext = _dbProvider.CreateDbContext();
-            return UserQuery(dbContext)
-                .FirstOrDefault(user => user.Id == id);
-        }
-
-        private static IQueryable<User> UserQuery(JellyfinDbContext dbContext)
-        {
-            return dbContext.Users
-                            .AsSingleQuery()
-                            .Include(user => user.Permissions)
-                            .Include(user => user.Preferences)
-                            .Include(user => user.AccessSchedules)
-                            .Include(user => user.ProfileImage)
-                            .AsNoTracking();
-        }
-
-        /// <inheritdoc/>
-        public User? GetFirstUser()
-        {
-            using var dbContext = _dbProvider.CreateDbContext();
-            return UserQuery(dbContext).FirstOrDefault();
+            _users.TryGetValue(id, out var user);
+            return user;
        }

        /// <inheritdoc/>
@@ -159,57 +139,42 @@ namespace Jellyfin.Server.Implementations.Users
                throw new ArgumentException("Invalid username", nameof(name));
            }

-            using var dbContext = _dbProvider.CreateDbContext();
-#pragma warning disable CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-#pragma warning disable CA1311 // Specify a culture or use an invariant version to avoid implicit dependency on current culture
-#pragma warning disable CA1304 // The behavior of 'string.ToUpper()' could vary based on the current user's locale settings
-            return UserQuery(dbContext)
-                .FirstOrDefault(u => u.Username.ToUpper() == name.ToUpper());
-#pragma warning restore CA1304 // The behavior of 'string.ToUpper()' could vary based on the current user's locale settings
-#pragma warning restore CA1311 // Specify a culture or use an invariant version to avoid implicit dependency on current culture
-#pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
+            return _users.Values.FirstOrDefault(u => string.Equals(u.Username, name, StringComparison.OrdinalIgnoreCase));
        }

        /// <inheritdoc/>
-        public async Task RenameUser(Guid userId, string oldName, string newName)
+        public async Task RenameUser(User user, string newName)
        {
+            ArgumentNullException.ThrowIfNull(user);
+
            ThrowIfInvalidUsername(newName);

-            if (oldName.Equals(newName, StringComparison.OrdinalIgnoreCase))
+            if (user.Username.Equals(newName, StringComparison.Ordinal))
            {
                throw new ArgumentException("The new and old names must be different.");
            }

-            User user = null!; // user is never actually null where its used afterwards so we can just ignore.
-            using (await _userLock.LockAsync(userId).ConfigureAwait(false))
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
            {
-                var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-                await using (dbContext.ConfigureAwait(false))
-                {
 #pragma warning disable CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
 #pragma warning disable CA1311 // Specify a culture or use an invariant version to avoid implicit dependency on current culture
 #pragma warning disable CA1304 // The behavior of 'string.ToUpper()' could vary based on the current user's locale settings
-                    if (await dbContext.Users
-                            .AnyAsync(u => u.Username.ToUpper() == newName.ToUpper() && u.Id != userId)
-                            .ConfigureAwait(false))
-                    {
-                        throw new ArgumentException(string.Format(
-                            CultureInfo.InvariantCulture,
-                            "A user with the name '{0}' already exists.",
-                            newName));
-                    }
+                if (await dbContext.Users
+                        .AnyAsync(u => u.Username.ToUpper() == newName.ToUpper() && !u.Id.Equals(user.Id))
+                        .ConfigureAwait(false))
+                {
+                    throw new ArgumentException(string.Format(
+                        CultureInfo.InvariantCulture,
+                        "A user with the name '{0}' already exists.",
+                        newName));
+                }
 #pragma warning restore CA1304 // The behavior of 'string.ToUpper()' could vary based on the current user's locale settings
 #pragma warning restore CA1311 // Specify a culture or use an invariant version to avoid implicit dependency on current culture
 #pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons

-                    user = await UserQuery(dbContext)
-                        .AsTracking()
-                        .FirstOrDefaultAsync(u => u.Id == userId)
-                        .ConfigureAwait(false)
-                        ?? throw new ResourceNotFoundException(nameof(userId));
-                    user.Username = newName;
-                    await UpdateUserInternalAsync(dbContext, user).ConfigureAwait(false);
-                }
+                user.Username = newName;
+                await UpdateUserInternalAsync(dbContext, user).ConfigureAwait(false);
            }

            var eventArgs = new UserUpdatedEventArgs(user);
@@ -220,9 +185,10 @@ namespace Jellyfin.Server.Implementations.Users
        /// <inheritdoc/>
        public async Task UpdateUserAsync(User user)
        {
-            using (await _userLock.LockAsync(user.Id).ConfigureAwait(false))
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
            {
-                await UpdateUserInternalAsync(user).ConfigureAwait(false);
+                await UpdateUserInternalAsync(dbContext, user).ConfigureAwait(false);
            }
        }

@@ -252,30 +218,23 @@ namespace Jellyfin.Server.Implementations.Users
        {
            ThrowIfInvalidUsername(name);

+            if (Users.Any(u => u.Username.Equals(name, StringComparison.OrdinalIgnoreCase)))
+            {
+                throw new ArgumentException(string.Format(
+                    CultureInfo.InvariantCulture,
+                    "A user with the name '{0}' already exists.",
+                    name));
+            }
+
            User newUser;
            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
            await using (dbContext.ConfigureAwait(false))
            {
-#pragma warning disable CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-#pragma warning disable CA1311 // Specify a culture or use an invariant version to avoid implicit dependency on current culture
-#pragma warning disable CA1304 // The behavior of 'string.ToUpper()' could vary based on the current user's locale settings
-                if (await dbContext.Users
-                        .AnyAsync(u => u.Username.ToUpper() == name.ToUpper())
-                        .ConfigureAwait(false))
-                {
-                    throw new ArgumentException(string.Format(
-                        CultureInfo.InvariantCulture,
-                        "A user with the name '{0}' already exists.",
-                        name));
-                }
-#pragma warning restore CA1304 // The behavior of 'string.ToUpper()' could vary based on the current user's locale settings
-#pragma warning restore CA1311 // Specify a culture or use an invariant version to avoid implicit dependency on current culture
-#pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-
                newUser = await CreateUserInternalAsync(name, dbContext).ConfigureAwait(false);

                dbContext.Users.Add(newUser);
                await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                _users.Add(newUser.Id, newUser);
            }

            await _eventManager.PublishAsync(new UserCreatedEventArgs(newUser)).ConfigureAwait(false);
@@ -286,82 +245,62 @@ namespace Jellyfin.Server.Implementations.Users
        /// <inheritdoc/>
        public async Task DeleteUserAsync(Guid userId)
        {
-            User? user;
-            using (await _userLock.LockAsync(userId).ConfigureAwait(false))
+            if (!_users.TryGetValue(userId, out var user))
            {
-                var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-                await using (dbContext.ConfigureAwait(false))
-                {
-                    user = await dbContext.Users
-                        .Include(u => u.Permissions)
-                        .FirstOrDefaultAsync(u => u.Id.Equals(userId))
-                        .ConfigureAwait(false);
-                    if (user is null)
-                    {
-                        throw new ResourceNotFoundException(nameof(userId));
-                    }
-
-                    var userCount = await dbContext.Users.CountAsync().ConfigureAwait(false);
-                    if (userCount == 1)
-                    {
-                        throw new InvalidOperationException(string.Format(
-                            CultureInfo.InvariantCulture,
-                            "The user '{0}' cannot be deleted because there must be at least one user in the system.",
-                            user.Username));
-                    }
-
-                    if (user.HasPermission(PermissionKind.IsAdministrator)
-                        && await dbContext.Users
-                            .CountAsync(i => i.Permissions.Any(p => p.Kind == PermissionKind.IsAdministrator && p.Value))
-                            .ConfigureAwait(false) == 1)
-                    {
-                        throw new ArgumentException(
-                            string.Format(
-                                CultureInfo.InvariantCulture,
-                                "The user '{0}' cannot be deleted because there must be at least one admin user in the system.",
-                                user.Username),
-                            nameof(userId));
-                    }
-
-                    dbContext.Users.Remove(user);
-                    await dbContext.SaveChangesAsync().ConfigureAwait(false);
-                }
+                throw new ResourceNotFoundException(nameof(userId));
            }

+            if (_users.Count == 1)
+            {
+                throw new InvalidOperationException(string.Format(
+                    CultureInfo.InvariantCulture,
+                    "The user '{0}' cannot be deleted because there must be at least one user in the system.",
+                    user.Username));
+            }
+
+            if (user.HasPermission(PermissionKind.IsAdministrator)
+                && Users.Count(i => i.HasPermission(PermissionKind.IsAdministrator)) == 1)
+            {
+                throw new ArgumentException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "The user '{0}' cannot be deleted because there must be at least one admin user in the system.",
+                        user.Username),
+                    nameof(userId));
+            }
+
+            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);
+            }
+
+            _users.Remove(userId);
+
            await _eventManager.PublishAsync(new UserDeletedEventArgs(user)).ConfigureAwait(false);
        }

        /// <inheritdoc/>
-        public Task ResetPassword(Guid userId)
+        public Task ResetPassword(User user)
        {
-            return ChangePassword(userId, string.Empty);
+            return ChangePassword(user, string.Empty);
        }

        /// <inheritdoc/>
-        public async Task ChangePassword(Guid userId, string newPassword)
+        public async Task ChangePassword(User user, string newPassword)
        {
-            User dbUser = null!;
-            using (await _userLock.LockAsync(userId).ConfigureAwait(false))
+            ArgumentNullException.ThrowIfNull(user);
+            if (user.HasPermission(PermissionKind.IsAdministrator) && string.IsNullOrWhiteSpace(newPassword))
            {
-                var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-                await using (dbContext.ConfigureAwait(false))
-                {
-                    dbUser = await UserQuery(dbContext)
-                        .AsTracking()
-                        .FirstOrDefaultAsync(u => u.Id == userId)
-                        .ConfigureAwait(false)
-                        ?? throw new ResourceNotFoundException(nameof(userId));
-                    if (dbUser.HasPermission(PermissionKind.IsAdministrator) && string.IsNullOrWhiteSpace(newPassword))
-                    {
-                        throw new ArgumentException("Admin user passwords must not be empty", nameof(newPassword));
-                    }
-
-                    await GetAuthenticationProvider(dbUser).ChangePassword(dbUser, newPassword).ConfigureAwait(false);
-                    await dbContext.SaveChangesAsync().ConfigureAwait(false);
-                }
+                throw new ArgumentException("Admin user passwords must not be empty", nameof(newPassword));
            }

-            await _eventManager.PublishAsync(new UserPasswordChangedEventArgs(dbUser)).ConfigureAwait(false);
+            await GetAuthenticationProvider(user).ChangePassword(user, newPassword).ConfigureAwait(false);
+            await UpdateUserAsync(user).ConfigureAwait(false);
+
+            await _eventManager.PublishAsync(new UserPasswordChangedEventArgs(user)).ConfigureAwait(false);
        }

        /// <inheritdoc/>
@@ -461,114 +400,102 @@ namespace Jellyfin.Server.Implementations.Users
                throw new ArgumentNullException(nameof(username));
            }

-            bool success;
-            var user = GetUserByName(username);
-            using (await _userLock.LockAsync(user?.Id ?? Guid.Empty).ConfigureAwait(false))
+            var user = Users.FirstOrDefault(i => string.Equals(username, i.Username, StringComparison.OrdinalIgnoreCase));
+            var authResult = await AuthenticateLocalUser(username, password, user)
+                .ConfigureAwait(false);
+            var authenticationProvider = authResult.AuthenticationProvider;
+            var success = authResult.Success;
+
+            if (user is null)
            {
-                // Reload the user now that we hold the lock so the RowVersion is current.
-                // GetUserByName uses AsNoTracking and the snapshot may be stale if another
-                // write (e.g. a concurrent login) incremented RowVersion after our initial load.
-                if (user is not null)
+                string updatedUsername = authResult.Username;
+
+                if (success
+                    && authenticationProvider is not null
+                    && authenticationProvider is not DefaultAuthenticationProvider)
                {
-                    user = GetUserById(user.Id) ?? user;
-                }
+                    // Trust the username returned by the authentication provider
+                    username = updatedUsername;

-                var authResult = await AuthenticateLocalUser(username, password, user)
-                    .ConfigureAwait(false);
-                var authenticationProvider = authResult.AuthenticationProvider;
-                success = authResult.Success;
+                    // Search the database for the user again
+                    // the authentication provider might have created it
+                    user = Users.FirstOrDefault(i => string.Equals(username, i.Username, StringComparison.OrdinalIgnoreCase));

-                if (user is null)
-                {
-                    string updatedUsername = authResult.Username;
-
-                    if (success
-                        && authenticationProvider is not null
-                        && authenticationProvider is not DefaultAuthenticationProvider)
+                    if (authenticationProvider is IHasNewUserPolicy hasNewUserPolicy && user is not null)
                    {
-                        // Trust the username returned by the authentication provider
-                        username = updatedUsername;
-
-                        // Search the database for the user again
-                        // the authentication provider might have created it
-                        user = GetUserByName(username);
-
-                        if (authenticationProvider is IHasNewUserPolicy hasNewUserPolicy && user is not null)
-                        {
-                            await UpdatePolicyAsync(user.Id, hasNewUserPolicy.GetNewUserPolicy()).ConfigureAwait(false);
-                        }
+                        await UpdatePolicyAsync(user.Id, hasNewUserPolicy.GetNewUserPolicy()).ConfigureAwait(false);
                    }
                }
+            }

-                if (success && user is not null && authenticationProvider is not null)
+            if (success && user is not null && authenticationProvider is not null)
+            {
+                var providerId = authenticationProvider.GetType().FullName;
+
+                if (providerId is not null && !string.Equals(providerId, user.AuthenticationProviderId, StringComparison.OrdinalIgnoreCase))
                {
-                    var providerId = authenticationProvider.GetType().FullName;
+                    user.AuthenticationProviderId = providerId;
+                    await UpdateUserAsync(user).ConfigureAwait(false);
+                }
+            }

-                    if (providerId is not null && !string.Equals(providerId, user.AuthenticationProviderId, StringComparison.OrdinalIgnoreCase))
-                    {
-                        user.AuthenticationProviderId = providerId;
-                        await UpdateUserInternalAsync(user).ConfigureAwait(false);
-                    }
+            if (user is null)
+            {
+                _logger.LogInformation(
+                    "Authentication request for {UserName} has been denied (IP: {IP}).",
+                    username,
+                    remoteEndPoint);
+                throw new AuthenticationException("Invalid username or password entered.");
+            }
+
+            if (user.HasPermission(PermissionKind.IsDisabled))
+            {
+                _logger.LogInformation(
+                    "Authentication request for {UserName} has been denied because this account is currently disabled (IP: {IP}).",
+                    username,
+                    remoteEndPoint);
+                throw new SecurityException(
+                    $"The {user.Username} account is currently disabled. Please consult with your administrator.");
+            }
+
+            if (!user.HasPermission(PermissionKind.EnableRemoteAccess) &&
+                !_networkManager.IsInLocalNetwork(remoteEndPoint))
+            {
+                _logger.LogInformation(
+                    "Authentication request for {UserName} forbidden: remote access disabled and user not in local network (IP: {IP}).",
+                    username,
+                    remoteEndPoint);
+                throw new SecurityException("Forbidden.");
+            }
+
+            if (!user.IsParentalScheduleAllowed())
+            {
+                _logger.LogInformation(
+                    "Authentication request for {UserName} is not allowed at this time due parental restrictions (IP: {IP}).",
+                    username,
+                    remoteEndPoint);
+                throw new SecurityException("User is not allowed access at this time.");
+            }
+
+            // Update LastActivityDate and LastLoginDate, then save
+            if (success)
+            {
+                if (isUserSession)
+                {
+                    user.LastActivityDate = user.LastLoginDate = DateTime.UtcNow;
                }

-                if (user is null)
-                {
-                    _logger.LogInformation(
-                        "Authentication request for {UserName} has been denied (IP: {IP}).",
-                        username,
-                        remoteEndPoint);
-                    throw new AuthenticationException("Invalid username or password entered.");
-                }
-
-                if (user.HasPermission(PermissionKind.IsDisabled))
-                {
-                    _logger.LogInformation(
-                        "Authentication request for {UserName} has been denied because this account is currently disabled (IP: {IP}).",
-                        username,
-                        remoteEndPoint);
-                    throw new SecurityException(
-                        $"The {user.Username} account is currently disabled. Please consult with your administrator.");
-                }
-
-                if (!user.HasPermission(PermissionKind.EnableRemoteAccess) &&
-                    !_networkManager.IsInLocalNetwork(remoteEndPoint))
-                {
-                    _logger.LogInformation(
-                        "Authentication request for {UserName} forbidden: remote access disabled and user not in local network (IP: {IP}).",
-                        username,
-                        remoteEndPoint);
-                    throw new SecurityException("Forbidden.");
-                }
-
-                if (!user.IsParentalScheduleAllowed())
-                {
-                    _logger.LogInformation(
-                        "Authentication request for {UserName} is not allowed at this time due parental restrictions (IP: {IP}).",
-                        username,
-                        remoteEndPoint);
-                    throw new SecurityException("User is not allowed access at this time.");
-                }
-
-                // Update LastActivityDate and LastLoginDate, then save
-                if (success)
-                {
-                    if (isUserSession)
-                    {
-                        user.LastActivityDate = user.LastLoginDate = DateTime.UtcNow;
-                    }
-
-                    user.InvalidLoginAttemptCount = 0;
-                    await UpdateUserInternalAsync(user).ConfigureAwait(false);
-                    _logger.LogInformation("Authentication request for {UserName} has succeeded.", user.Username);
-                }
-                else
-                {
-                    await IncrementInvalidLoginAttemptCount(user).ConfigureAwait(false);
-                    _logger.LogInformation(
-                        "Authentication request for {UserName} has been denied (IP: {IP}).",
-                        user.Username,
-                        remoteEndPoint);
-                }
+                user.InvalidLoginAttemptCount = 0;
+                await UpdateUserAsync(user).ConfigureAwait(false);
+                _logger.LogInformation("Authentication request for {UserName} has succeeded.", user.Username);
+            }
+            else
+            {
+                await IncrementInvalidLoginAttemptCount(user).ConfigureAwait(false);
+                _logger.LogInformation(
+                    "Authentication request for {UserName} has been denied (IP: {IP}).",
+                    user.Username,
+                    remoteEndPoint);
            }

            return success ? user : null;
@@ -612,22 +539,22 @@ namespace Jellyfin.Server.Implementations.Users
        public async Task InitializeAsync()
        {
            // TODO: Refactor the startup wizard so that it doesn't require a user to already exist.
+            if (_users.Any())
+            {
+                return;
+            }
+
+            var defaultName = Environment.UserName;
+            if (string.IsNullOrWhiteSpace(defaultName) || !ValidUsernameRegex().IsMatch(defaultName))
+            {
+                defaultName = "MyJellyfinUser";
+            }
+
+            _logger.LogWarning("No users, creating one with username {UserName}", defaultName);
+
            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
            await using (dbContext.ConfigureAwait(false))
            {
-                if (await dbContext.Users.AnyAsync().ConfigureAwait(false))
-                {
-                    return;
-                }
-
-                var defaultName = Environment.UserName;
-                if (string.IsNullOrWhiteSpace(defaultName) || !ValidUsernameRegex().IsMatch(defaultName))
-                {
-                    defaultName = "MyJellyfinUser";
-                }
-
-                _logger.LogWarning("No users, creating one with username {UserName}", defaultName);
-
                var newUser = await CreateUserInternalAsync(defaultName, dbContext).ConfigureAwait(false);
                newUser.SetPermission(PermissionKind.IsAdministrator, true);
                newUser.SetPermission(PermissionKind.EnableContentDeletion, true);
@@ -635,6 +562,7 @@ namespace Jellyfin.Server.Implementations.Users

                dbContext.Users.Add(newUser);
                await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                _users.Add(newUser.Id, newUser);
            }
        }

@@ -671,120 +599,124 @@ namespace Jellyfin.Server.Implementations.Users
        /// <inheritdoc/>
        public async Task UpdateConfigurationAsync(Guid userId, UserConfiguration config)
        {
-            using (await _userLock.LockAsync(userId).ConfigureAwait(false))
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
            {
-                var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-                await using (dbContext.ConfigureAwait(false))
+                var user = dbContext.Users
+                               .Include(u => u.Permissions)
+                               .Include(u => u.Preferences)
+                               .Include(u => u.AccessSchedules)
+                               .Include(u => u.ProfileImage)
+                               .AsSingleQuery()
+                               .FirstOrDefault(u => u.Id.Equals(userId))
+                           ?? throw new ArgumentException("No user exists with given Id!");
+
+                user.SubtitleMode = config.SubtitleMode;
+                user.HidePlayedInLatest = config.HidePlayedInLatest;
+                user.EnableLocalPassword = config.EnableLocalPassword;
+                user.PlayDefaultAudioTrack = config.PlayDefaultAudioTrack;
+                user.DisplayCollectionsView = config.DisplayCollectionsView;
+                user.DisplayMissingEpisodes = config.DisplayMissingEpisodes;
+                user.AudioLanguagePreference = config.AudioLanguagePreference;
+                user.RememberAudioSelections = config.RememberAudioSelections;
+                user.EnableNextEpisodeAutoPlay = config.EnableNextEpisodeAutoPlay;
+                user.RememberSubtitleSelections = config.RememberSubtitleSelections;
+                user.SubtitleLanguagePreference = config.SubtitleLanguagePreference;
+
+                // Only set cast receiver id if it is passed in and it exists in the server config.
+                if (!string.IsNullOrEmpty(config.CastReceiverId)
+                    && _serverConfigurationManager.Configuration.CastReceiverApplications.Any(c => string.Equals(c.Id, config.CastReceiverId, StringComparison.Ordinal)))
                {
-                    var user = UserQuery(dbContext)
-                                   .AsTracking()
-                                   .FirstOrDefault(u => u.Id.Equals(userId))
-                               ?? throw new ArgumentException("No user exists with given Id!");
-
-                    user.SubtitleMode = config.SubtitleMode;
-                    user.HidePlayedInLatest = config.HidePlayedInLatest;
-                    user.EnableLocalPassword = config.EnableLocalPassword;
-                    user.PlayDefaultAudioTrack = config.PlayDefaultAudioTrack;
-                    user.DisplayCollectionsView = config.DisplayCollectionsView;
-                    user.DisplayMissingEpisodes = config.DisplayMissingEpisodes;
-                    user.AudioLanguagePreference = config.AudioLanguagePreference;
-                    user.RememberAudioSelections = config.RememberAudioSelections;
-                    user.EnableNextEpisodeAutoPlay = config.EnableNextEpisodeAutoPlay;
-                    user.RememberSubtitleSelections = config.RememberSubtitleSelections;
-                    user.SubtitleLanguagePreference = config.SubtitleLanguagePreference;
-
-                    // Only set cast receiver id if it is passed in and it exists in the server config.
-                    if (!string.IsNullOrEmpty(config.CastReceiverId)
-                        && _serverConfigurationManager.Configuration.CastReceiverApplications.Any(c => string.Equals(c.Id, config.CastReceiverId, StringComparison.Ordinal)))
-                    {
-                        user.CastReceiverId = config.CastReceiverId;
-                    }
-
-                    user.SetPreference(PreferenceKind.OrderedViews, config.OrderedViews);
-                    user.SetPreference(PreferenceKind.GroupedFolders, config.GroupedFolders);
-                    user.SetPreference(PreferenceKind.MyMediaExcludes, config.MyMediaExcludes);
-                    user.SetPreference(PreferenceKind.LatestItemExcludes, config.LatestItemsExcludes);
-
-                    dbContext.Update(user);
-                    await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                    user.CastReceiverId = config.CastReceiverId;
                }
+
+                user.SetPreference(PreferenceKind.OrderedViews, config.OrderedViews);
+                user.SetPreference(PreferenceKind.GroupedFolders, config.GroupedFolders);
+                user.SetPreference(PreferenceKind.MyMediaExcludes, config.MyMediaExcludes);
+                user.SetPreference(PreferenceKind.LatestItemExcludes, config.LatestItemsExcludes);
+
+                dbContext.Update(user);
+                _users[user.Id] = user;
+                await dbContext.SaveChangesAsync().ConfigureAwait(false);
            }
        }

        /// <inheritdoc/>
        public async Task UpdatePolicyAsync(Guid userId, UserPolicy policy)
        {
-            using (await _userLock.LockAsync(userId).ConfigureAwait(false))
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
            {
-                var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-                await using (dbContext.ConfigureAwait(false))
+                var user = dbContext.Users
+                               .Include(u => u.Permissions)
+                               .Include(u => u.Preferences)
+                               .Include(u => u.AccessSchedules)
+                               .Include(u => u.ProfileImage)
+                               .AsSingleQuery()
+                               .FirstOrDefault(u => u.Id.Equals(userId))
+                           ?? throw new ArgumentException("No user exists with given Id!");
+
+                // The default number of login attempts is 3, but for some god forsaken reason it's sent to the server as "0"
+                int? maxLoginAttempts = policy.LoginAttemptsBeforeLockout switch
                {
-                    var user = UserQuery(dbContext)
-                        .AsTracking()
-                        .FirstOrDefault(u => u.Id.Equals(userId))
-                        ?? throw new ArgumentException("No user exists with given Id!");
+                    -1 => null,
+                    0 => 3,
+                    _ => policy.LoginAttemptsBeforeLockout
+                };

-                    // The default number of login attempts is 3, but for some god forsaken reason it's sent to the server as "0"
-                    int? maxLoginAttempts = policy.LoginAttemptsBeforeLockout switch
-                    {
-                        -1 => null,
-                        0 => 3,
-                        _ => policy.LoginAttemptsBeforeLockout
-                    };
+                user.MaxParentalRatingScore = policy.MaxParentalRating;
+                user.MaxParentalRatingSubScore = policy.MaxParentalSubRating;
+                user.EnableUserPreferenceAccess = policy.EnableUserPreferenceAccess;
+                user.RemoteClientBitrateLimit = policy.RemoteClientBitrateLimit;
+                user.AuthenticationProviderId = policy.AuthenticationProviderId;
+                user.PasswordResetProviderId = policy.PasswordResetProviderId;
+                user.InvalidLoginAttemptCount = policy.InvalidLoginAttemptCount;
+                user.LoginAttemptsBeforeLockout = maxLoginAttempts;
+                user.MaxActiveSessions = policy.MaxActiveSessions;
+                user.SyncPlayAccess = policy.SyncPlayAccess;
+                user.SetPermission(PermissionKind.IsAdministrator, policy.IsAdministrator);
+                user.SetPermission(PermissionKind.IsHidden, policy.IsHidden);
+                user.SetPermission(PermissionKind.IsDisabled, policy.IsDisabled);
+                user.SetPermission(PermissionKind.EnableSharedDeviceControl, policy.EnableSharedDeviceControl);
+                user.SetPermission(PermissionKind.EnableRemoteAccess, policy.EnableRemoteAccess);
+                user.SetPermission(PermissionKind.EnableLiveTvManagement, policy.EnableLiveTvManagement);
+                user.SetPermission(PermissionKind.EnableLiveTvAccess, policy.EnableLiveTvAccess);
+                user.SetPermission(PermissionKind.EnableMediaPlayback, policy.EnableMediaPlayback);
+                user.SetPermission(PermissionKind.EnableAudioPlaybackTranscoding, policy.EnableAudioPlaybackTranscoding);
+                user.SetPermission(PermissionKind.EnableVideoPlaybackTranscoding, policy.EnableVideoPlaybackTranscoding);
+                user.SetPermission(PermissionKind.EnableContentDeletion, policy.EnableContentDeletion);
+                user.SetPermission(PermissionKind.EnableContentDownloading, policy.EnableContentDownloading);
+                user.SetPermission(PermissionKind.EnableSyncTranscoding, policy.EnableSyncTranscoding);
+                user.SetPermission(PermissionKind.EnableMediaConversion, policy.EnableMediaConversion);
+                user.SetPermission(PermissionKind.EnableAllChannels, policy.EnableAllChannels);
+                user.SetPermission(PermissionKind.EnableAllDevices, policy.EnableAllDevices);
+                user.SetPermission(PermissionKind.EnableAllFolders, policy.EnableAllFolders);
+                user.SetPermission(PermissionKind.EnableRemoteControlOfOtherUsers, policy.EnableRemoteControlOfOtherUsers);
+                user.SetPermission(PermissionKind.EnablePlaybackRemuxing, policy.EnablePlaybackRemuxing);
+                user.SetPermission(PermissionKind.EnableCollectionManagement, policy.EnableCollectionManagement);
+                user.SetPermission(PermissionKind.EnableSubtitleManagement, policy.EnableSubtitleManagement);
+                user.SetPermission(PermissionKind.EnableLyricManagement, policy.EnableLyricManagement);
+                user.SetPermission(PermissionKind.ForceRemoteSourceTranscoding, policy.ForceRemoteSourceTranscoding);
+                user.SetPermission(PermissionKind.EnablePublicSharing, policy.EnablePublicSharing);

-                    user.MaxParentalRatingScore = policy.MaxParentalRating;
-                    user.MaxParentalRatingSubScore = policy.MaxParentalSubRating;
-                    user.EnableUserPreferenceAccess = policy.EnableUserPreferenceAccess;
-                    user.RemoteClientBitrateLimit = policy.RemoteClientBitrateLimit;
-                    user.AuthenticationProviderId = policy.AuthenticationProviderId;
-                    user.PasswordResetProviderId = policy.PasswordResetProviderId;
-                    user.InvalidLoginAttemptCount = policy.InvalidLoginAttemptCount;
-                    user.LoginAttemptsBeforeLockout = maxLoginAttempts;
-                    user.MaxActiveSessions = policy.MaxActiveSessions;
-                    user.SyncPlayAccess = policy.SyncPlayAccess;
-                    user.SetPermission(PermissionKind.IsAdministrator, policy.IsAdministrator);
-                    user.SetPermission(PermissionKind.IsHidden, policy.IsHidden);
-                    user.SetPermission(PermissionKind.IsDisabled, policy.IsDisabled);
-                    user.SetPermission(PermissionKind.EnableSharedDeviceControl, policy.EnableSharedDeviceControl);
-                    user.SetPermission(PermissionKind.EnableRemoteAccess, policy.EnableRemoteAccess);
-                    user.SetPermission(PermissionKind.EnableLiveTvManagement, policy.EnableLiveTvManagement);
-                    user.SetPermission(PermissionKind.EnableLiveTvAccess, policy.EnableLiveTvAccess);
-                    user.SetPermission(PermissionKind.EnableMediaPlayback, policy.EnableMediaPlayback);
-                    user.SetPermission(PermissionKind.EnableAudioPlaybackTranscoding, policy.EnableAudioPlaybackTranscoding);
-                    user.SetPermission(PermissionKind.EnableVideoPlaybackTranscoding, policy.EnableVideoPlaybackTranscoding);
-                    user.SetPermission(PermissionKind.EnableContentDeletion, policy.EnableContentDeletion);
-                    user.SetPermission(PermissionKind.EnableContentDownloading, policy.EnableContentDownloading);
-                    user.SetPermission(PermissionKind.EnableSyncTranscoding, policy.EnableSyncTranscoding);
-                    user.SetPermission(PermissionKind.EnableMediaConversion, policy.EnableMediaConversion);
-                    user.SetPermission(PermissionKind.EnableAllChannels, policy.EnableAllChannels);
-                    user.SetPermission(PermissionKind.EnableAllDevices, policy.EnableAllDevices);
-                    user.SetPermission(PermissionKind.EnableAllFolders, policy.EnableAllFolders);
-                    user.SetPermission(PermissionKind.EnableRemoteControlOfOtherUsers, policy.EnableRemoteControlOfOtherUsers);
-                    user.SetPermission(PermissionKind.EnablePlaybackRemuxing, policy.EnablePlaybackRemuxing);
-                    user.SetPermission(PermissionKind.EnableCollectionManagement, policy.EnableCollectionManagement);
-                    user.SetPermission(PermissionKind.EnableSubtitleManagement, policy.EnableSubtitleManagement);
-                    user.SetPermission(PermissionKind.EnableLyricManagement, policy.EnableLyricManagement);
-                    user.SetPermission(PermissionKind.ForceRemoteSourceTranscoding, policy.ForceRemoteSourceTranscoding);
-                    user.SetPermission(PermissionKind.EnablePublicSharing, policy.EnablePublicSharing);
-
-                    user.AccessSchedules.Clear();
-                    foreach (var policyAccessSchedule in policy.AccessSchedules)
-                    {
-                        user.AccessSchedules.Add(policyAccessSchedule);
-                    }
-
-                    // TODO: fix this at some point
-                    user.SetPreference(PreferenceKind.BlockUnratedItems, policy.BlockUnratedItems ?? Array.Empty<UnratedItem>());
-                    user.SetPreference(PreferenceKind.BlockedTags, policy.BlockedTags);
-                    user.SetPreference(PreferenceKind.AllowedTags, policy.AllowedTags);
-                    user.SetPreference(PreferenceKind.EnabledChannels, policy.EnabledChannels);
-                    user.SetPreference(PreferenceKind.EnabledDevices, policy.EnabledDevices);
-                    user.SetPreference(PreferenceKind.EnabledFolders, policy.EnabledFolders);
-                    user.SetPreference(PreferenceKind.EnableContentDeletionFromFolders, policy.EnableContentDeletionFromFolders);
-
-                    dbContext.Update(user);
-                    await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                user.AccessSchedules.Clear();
+                foreach (var policyAccessSchedule in policy.AccessSchedules)
+                {
+                    user.AccessSchedules.Add(policyAccessSchedule);
                }
+
+                // TODO: fix this at some point
+                user.SetPreference(PreferenceKind.BlockUnratedItems, policy.BlockUnratedItems ?? Array.Empty<UnratedItem>());
+                user.SetPreference(PreferenceKind.BlockedTags, policy.BlockedTags);
+                user.SetPreference(PreferenceKind.AllowedTags, policy.AllowedTags);
+                user.SetPreference(PreferenceKind.EnabledChannels, policy.EnabledChannels);
+                user.SetPreference(PreferenceKind.EnabledDevices, policy.EnabledDevices);
+                user.SetPreference(PreferenceKind.EnabledFolders, policy.EnabledFolders);
+                user.SetPreference(PreferenceKind.EnableContentDeletionFromFolders, policy.EnableContentDeletionFromFolders);
+
+                dbContext.Update(user);
+                _users[user.Id] = user;
+                await dbContext.SaveChangesAsync().ConfigureAwait(false);
            }
        }

@@ -796,17 +728,15 @@ namespace Jellyfin.Server.Implementations.Users
                return;
            }

-            using (await _userLock.LockAsync(user.Id).ConfigureAwait(false))
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
            {
-                var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-                await using (dbContext.ConfigureAwait(false))
-                {
-                    dbContext.Remove(user.ProfileImage);
-                    await dbContext.SaveChangesAsync().ConfigureAwait(false);
-                }
-
-                user.ProfileImage = null;
+                dbContext.Remove(user.ProfileImage);
+                await dbContext.SaveChangesAsync().ConfigureAwait(false);
            }
+
+            user.ProfileImage = null;
+            _users[user.Id] = user;
        }

        internal static void ThrowIfInvalidUsername(string name)
@@ -952,42 +882,15 @@ namespace Jellyfin.Server.Implementations.Users
                    user.InvalidLoginAttemptCount);
            }

-            await UpdateUserInternalAsync(user).ConfigureAwait(false);
-        }
-
-        private async Task UpdateUserInternalAsync(User user)
-        {
-            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
-            await using (dbContext.ConfigureAwait(false))
-            {
-                await UpdateUserInternalAsync(dbContext, user).ConfigureAwait(false);
-            }
+            await UpdateUserAsync(user).ConfigureAwait(false);
        }

        private async Task UpdateUserInternalAsync(JellyfinDbContext dbContext, User user)
        {
            dbContext.Users.Attach(user);
            dbContext.Entry(user).State = EntityState.Modified;
+            _users[user.Id] = user;
            await dbContext.SaveChangesAsync().ConfigureAwait(false);
        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Disposes all members of this class.
-        /// </summary>
-        /// <param name="disposing">Defines if the class has been cleaned up by a dispose or finalizer.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _userLock.Dispose();
-            }
-        }
    }
 }
--- a/Jellyfin.Server/Configuration/StartupMode.cs
+++ b/Jellyfin.Server/Configuration/StartupMode.cs
@@ -1,24 +0,0 @@
-using MediaBrowser.Model.Configuration;
-
-namespace Jellyfin.Server.Configuration;
-
-/// <summary>
-/// Defines types for usage with the <see cref="StartupOptions.StartupMode"/>.
-/// </summary>
-public enum StartupMode
-{
-    /// <summary>
-    /// Default startup mode, runs the jellyfin server in normal operation.
-    /// </summary>
-    MediaServer = 0,
-
-    /// <summary>
-    /// Attempts to Migrate the system only then shuts down.
-    /// </summary>
-    MigrateSystem = 1,
-
-    /// <summary>
-    /// Runs the Database seed function regardless of <see cref="BaseApplicationConfiguration.IsStartupWizardCompleted"/> state.
-    /// </summary>
-    SeedSystem = 2
-}
--- a/Jellyfin.Server/Migrations/JellyfinMigrationService.cs
+++ b/Jellyfin.Server/Migrations/JellyfinMigrationService.cs
@@ -90,7 +90,7 @@ internal class JellyfinMigrationService

    private HashSet<MigrationStage> Migrations { get; set; }

-    public async Task CheckFirstTimeRunOrMigration(IApplicationPaths appPaths, StartupOptions startupOptions)
+    public async Task CheckFirstTimeRunOrMigration(IApplicationPaths appPaths)
    {
        var logger = _startupLogger.With(_loggerFactory.CreateLogger<JellyfinMigrationService>()).BeginGroup($"Migration Startup");
        logger.LogInformation("Initialise Migration service.");
@@ -98,9 +98,9 @@ internal class JellyfinMigrationService
        var serverConfig = File.Exists(appPaths.SystemConfigurationFilePath)
            ? (ServerConfiguration)xmlSerializer.DeserializeFromFile(typeof(ServerConfiguration), appPaths.SystemConfigurationFilePath)!
            : new ServerConfiguration();
-        if (!serverConfig.IsStartupWizardCompleted || startupOptions.StartupMode is Configuration.StartupMode.SeedSystem)
+        if (!serverConfig.IsStartupWizardCompleted)
        {
-            logger.LogInformation("System initialization detected. Seed data. Startup mode is: {StartupMode}", startupOptions.StartupMode ?? Configuration.StartupMode.MediaServer);
+            logger.LogInformation("System initialisation detected. Seed data.");
            var flatApplyMigrations = Migrations.SelectMany(e => e.Where(f => !f.Metadata.RunMigrationOnSetup)).ToArray();

            var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
--- a/Jellyfin.Server/Migrations/Routines/DisableLegacyAuthorization.cs
+++ b/Jellyfin.Server/Migrations/Routines/DisableLegacyAuthorization.cs
@@ -0,0 +1,32 @@
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
+
+namespace Jellyfin.Server.Migrations.Routines;
+
+/// <summary>
+/// Migration to disable legacy authorization in the system config.
+/// </summary>
+[JellyfinMigration("2025-11-18T16:00:00", nameof(DisableLegacyAuthorization))]
+public class DisableLegacyAuthorization : IAsyncMigrationRoutine
+{
+    private readonly IServerConfigurationManager _serverConfigurationManager;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DisableLegacyAuthorization"/> class.
+    /// </summary>
+    /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
+    public DisableLegacyAuthorization(IServerConfigurationManager serverConfigurationManager)
+    {
+        _serverConfigurationManager = serverConfigurationManager;
+    }
+
+    /// <inheritdoc />
+    public Task PerformAsync(CancellationToken cancellationToken)
+    {
+        _serverConfigurationManager.Configuration.EnableLegacyAuthorization = false;
+        _serverConfigurationManager.SaveConfiguration();
+
+        return Task.CompletedTask;
+    }
+}
--- a/Jellyfin.Server/Migrations/Routines/MergeDuplicateMusicArtists.cs
+++ b/Jellyfin.Server/Migrations/Routines/MergeDuplicateMusicArtists.cs
@@ -1,204 +0,0 @@
-#pragma warning disable RS0030 // Do not use banned APIs
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Server.ServerSetupApp;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-/// <summary>
-/// Merges MusicArtist records that differ only by Name casing. Prior to the case-insensitive
-/// dedup lookup added alongside this migration, the artist validator would create a second
-/// MusicArtist whenever a track tagged the artist with a different casing than the
-/// resolver-created one (e.g. "Thirty Seconds To Mars" vs. "Thirty Seconds to Mars").
-/// </summary>
-[JellyfinMigration("2026-05-08T12:00:00", nameof(MergeDuplicateMusicArtists))]
-[JellyfinMigrationBackup(JellyfinDb = true)]
-public class MergeDuplicateMusicArtists : IAsyncMigrationRoutine
-{
-    private const string MusicArtistType = "MediaBrowser.Controller.Entities.Audio.MusicArtist";
-
-    private readonly IStartupLogger<MergeDuplicateMusicArtists> _logger;
-    private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-    private readonly ILibraryManager _libraryManager;
-    private readonly IItemPersistenceService _persistenceService;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MergeDuplicateMusicArtists"/> class.
-    /// </summary>
-    /// <param name="logger">The startup logger.</param>
-    /// <param name="dbContextFactory">The database context factory.</param>
-    /// <param name="libraryManager">The library manager.</param>
-    /// <param name="persistenceService">The item persistence service.</param>
-    public MergeDuplicateMusicArtists(
-        IStartupLogger<MergeDuplicateMusicArtists> logger,
-        IDbContextFactory<JellyfinDbContext> dbContextFactory,
-        ILibraryManager libraryManager,
-        IItemPersistenceService persistenceService)
-    {
-        _logger = logger;
-        _dbContextFactory = dbContextFactory;
-        _libraryManager = libraryManager;
-        _persistenceService = persistenceService;
-    }
-
-    /// <inheritdoc/>
-    public async Task PerformAsync(CancellationToken cancellationToken)
-    {
-        var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await using (context.ConfigureAwait(false))
-        {
-            var artists = await context.BaseItems
-                .Where(b => b.Type == MusicArtistType && b.Name != null)
-                .Select(b => new { b.Id, b.Name, b.DateCreated })
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            var groups = artists
-                .GroupBy(a => a.Name!.ToLowerInvariant())
-                .Where(g => g.Count() > 1)
-                .ToList();
-
-            if (groups.Count == 0)
-            {
-                _logger.LogInformation("No case-only duplicate MusicArtist records found.");
-                return;
-            }
-
-            _logger.LogInformation("Found {Count} groups of case-only duplicate MusicArtist records.", groups.Count);
-
-            var idsToDelete = new List<Guid>();
-            foreach (var group in groups)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var groupIds = group.Select(g => g.Id).ToArray();
-
-                // Pick the keeper: the artist with the most child references is the "real" one
-                // (the resolver-created artist with a filesystem path); the duplicates are usually
-                // empty stubs created by the validator's case-sensitive miss.
-                var stats = await context.BaseItems
-                    .Where(b => groupIds.Contains(b.Id))
-                    .Select(b => new
-                    {
-                        b.Id,
-                        b.Name,
-                        b.DateCreated,
-                        ChildCount = context.BaseItems.Count(c => c.ParentId == b.Id),
-                        AncestorCount = context.AncestorIds.Count(a => a.ParentItemId == b.Id),
-                        LinkedCount = context.LinkedChildren.Count(l => l.ParentId == b.Id || l.ChildId == b.Id),
-                    })
-                    .ToListAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                var keeper = stats
-                    .OrderByDescending(s => s.ChildCount)
-                    .ThenByDescending(s => s.AncestorCount)
-                    .ThenByDescending(s => s.LinkedCount)
-                    .ThenBy(s => s.DateCreated)
-                    .First();
-
-                foreach (var dup in stats.Where(s => s.Id != keeper.Id))
-                {
-                    var keeperId = keeper.Id;
-                    var dupId = dup.Id;
-
-                    await context.BaseItems
-                        .Where(b => b.ParentId == dupId)
-                        .ExecuteUpdateAsync(s => s.SetProperty(b => b.ParentId, keeperId), cancellationToken)
-                        .ConfigureAwait(false);
-
-                    await context.BaseItems
-                        .Where(b => b.OwnerId == dupId)
-                        .ExecuteUpdateAsync(s => s.SetProperty(b => b.OwnerId, keeperId), cancellationToken)
-                        .ConfigureAwait(false);
-
-                    // AncestorIds PK is (ItemId, ParentItemId); drop rows that would collide before redirecting.
-                    await context.AncestorIds
-                        .Where(a => a.ParentItemId == dupId
-                            && context.AncestorIds.Any(k => k.ParentItemId == keeperId && k.ItemId == a.ItemId))
-                        .ExecuteDeleteAsync(cancellationToken)
-                        .ConfigureAwait(false);
-                    await context.AncestorIds
-                        .Where(a => a.ParentItemId == dupId)
-                        .ExecuteUpdateAsync(s => s.SetProperty(a => a.ParentItemId, keeperId), cancellationToken)
-                        .ConfigureAwait(false);
-
-                    // LinkedChildren PK is (ParentId, ChildId); drop colliding rows in both directions.
-                    await context.LinkedChildren
-                        .Where(l => l.ParentId == dupId
-                            && context.LinkedChildren.Any(k => k.ParentId == keeperId && k.ChildId == l.ChildId))
-                        .ExecuteDeleteAsync(cancellationToken)
-                        .ConfigureAwait(false);
-                    await context.LinkedChildren
-                        .Where(l => l.ParentId == dupId)
-                        .ExecuteUpdateAsync(s => s.SetProperty(l => l.ParentId, keeperId), cancellationToken)
-                        .ConfigureAwait(false);
-                    await context.LinkedChildren
-                        .Where(l => l.ChildId == dupId
-                            && context.LinkedChildren.Any(k => k.ChildId == keeperId && k.ParentId == l.ParentId))
-                        .ExecuteDeleteAsync(cancellationToken)
-                        .ConfigureAwait(false);
-                    await context.LinkedChildren
-                        .Where(l => l.ChildId == dupId)
-                        .ExecuteUpdateAsync(s => s.SetProperty(l => l.ChildId, keeperId), cancellationToken)
-                        .ConfigureAwait(false);
-
-                    // UserData has UNIQUE(UserId, CustomDataKey); keep the dup's row only when the
-                    // keeper has no equivalent row, otherwise the keeper's value wins.
-                    await context.UserData
-                        .Where(u => u.ItemId == dupId
-                            && context.UserData.Any(k => k.ItemId == keeperId && k.UserId == u.UserId && k.CustomDataKey == u.CustomDataKey))
-                        .ExecuteDeleteAsync(cancellationToken)
-                        .ConfigureAwait(false);
-                    await context.UserData
-                        .Where(u => u.ItemId == dupId)
-                        .ExecuteUpdateAsync(s => s.SetProperty(u => u.ItemId, keeperId), cancellationToken)
-                        .ConfigureAwait(false);
-
-                    idsToDelete.Add(dupId);
-                }
-
-                _logger.LogDebug(
-                    "Merged duplicates for '{Name}' into {KeeperId} ({Removed} removed).",
-                    keeper.Name,
-                    keeper.Id,
-                    stats.Count - 1);
-            }
-
-            if (idsToDelete.Count == 0)
-            {
-                return;
-            }
-
-            // Resolve via LibraryManager so DeleteItemsUnsafeFast can also remove the
-            // %MetadataPath%/artists/<Name> directories that the duplicate stubs left behind.
-            // Fall back to the persistence service for any items the LibraryManager can't resolve.
-            var itemsToDelete = idsToDelete
-                .Select(id => _libraryManager.GetItemById(id))
-                .Where(item => item is not null)
-                .ToList();
-            if (itemsToDelete.Count > 0)
-            {
-                _libraryManager.DeleteItemsUnsafeFast(itemsToDelete!);
-            }
-
-            var deletedIds = itemsToDelete.Select(i => i!.Id).ToHashSet();
-            var unresolvedIds = idsToDelete.Where(id => !deletedIds.Contains(id)).ToList();
-            if (unresolvedIds.Count > 0)
-            {
-                _persistenceService.DeleteItem(unresolvedIds);
-            }
-
-            _logger.LogInformation("Removed {Count} duplicate MusicArtist records.", idsToDelete.Count);
-        }
-    }
-}
--- a/Jellyfin.Server/Migrations/Routines/MergeDuplicatePeople.cs
+++ b/Jellyfin.Server/Migrations/Routines/MergeDuplicatePeople.cs
@@ -1,294 +0,0 @@
-#pragma warning disable RS0030 // Do not use banned APIs
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Server.ServerSetupApp;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-/// <summary>
-/// Merges case-only duplicate people. Two passes:
-/// 1) Person BaseItems whose Name differs only by casing — Person.GetPath hashes the name
-///    verbatim, so two casings produce two distinct Person rows in BaseItems.
-/// 2) Peoples lookup rows whose Name differs only by casing within the same PersonType —
-///    UpdatePeople used to insert a second Peoples row when a metadata provider returned
-///    a different casing than the row already in the table.
-/// Both bugs cause the /Persons endpoint to list the same person twice.
-/// </summary>
-[JellyfinMigration("2026-05-08T13:00:00", nameof(MergeDuplicatePeople))]
-[JellyfinMigrationBackup(JellyfinDb = true)]
-public class MergeDuplicatePeople : IAsyncMigrationRoutine
-{
-    private const string PersonType = "MediaBrowser.Controller.Entities.Person";
-
-    private readonly IStartupLogger<MergeDuplicatePeople> _logger;
-    private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-    private readonly ILibraryManager _libraryManager;
-    private readonly IItemPersistenceService _persistenceService;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MergeDuplicatePeople"/> class.
-    /// </summary>
-    /// <param name="logger">The startup logger.</param>
-    /// <param name="dbContextFactory">The database context factory.</param>
-    /// <param name="libraryManager">The library manager.</param>
-    /// <param name="persistenceService">The item persistence service.</param>
-    public MergeDuplicatePeople(
-        IStartupLogger<MergeDuplicatePeople> logger,
-        IDbContextFactory<JellyfinDbContext> dbContextFactory,
-        ILibraryManager libraryManager,
-        IItemPersistenceService persistenceService)
-    {
-        _logger = logger;
-        _dbContextFactory = dbContextFactory;
-        _libraryManager = libraryManager;
-        _persistenceService = persistenceService;
-    }
-
-    /// <inheritdoc/>
-    public async Task PerformAsync(CancellationToken cancellationToken)
-    {
-        var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await using (context.ConfigureAwait(false))
-        {
-            await MergePersonBaseItemsAsync(context, cancellationToken).ConfigureAwait(false);
-            await MergePeoplesRowsAsync(context, cancellationToken).ConfigureAwait(false);
-        }
-    }
-
-    private async Task MergePersonBaseItemsAsync(JellyfinDbContext context, CancellationToken cancellationToken)
-    {
-        var persons = await context.BaseItems
-            .Where(b => b.Type == PersonType && b.Name != null)
-            .Select(b => new { b.Id, b.Name, b.DateCreated })
-            .ToListAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        var groups = persons
-            .GroupBy(p => p.Name!.ToLowerInvariant())
-            .Where(g => g.Count() > 1)
-            .ToList();
-
-        if (groups.Count == 0)
-        {
-            _logger.LogInformation("No case-only duplicate Person BaseItems found.");
-            return;
-        }
-
-        _logger.LogInformation("Found {Count} groups of case-only duplicate Person BaseItems.", groups.Count);
-
-        var idsToDelete = new List<Guid>();
-        foreach (var group in groups)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var groupIds = group.Select(g => g.Id).ToArray();
-
-            // Pick the keeper: the Person with the most UserData rows (favorites, image
-            // refresh state) is the one users have actually interacted with.
-            var stats = await context.BaseItems
-                .Where(b => groupIds.Contains(b.Id))
-                .Select(b => new
-                {
-                    b.Id,
-                    b.Name,
-                    b.DateCreated,
-                    UserDataCount = context.UserData.Count(u => u.ItemId == b.Id),
-                    LinkedCount = context.LinkedChildren.Count(l => l.ParentId == b.Id || l.ChildId == b.Id),
-                })
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            var keeper = stats
-                .OrderByDescending(s => s.UserDataCount)
-                .ThenByDescending(s => s.LinkedCount)
-                .ThenBy(s => s.DateCreated)
-                .First();
-
-            foreach (var dup in stats.Where(s => s.Id != keeper.Id))
-            {
-                var keeperId = keeper.Id;
-                var dupId = dup.Id;
-
-                await context.BaseItems
-                    .Where(b => b.ParentId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(b => b.ParentId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                await context.BaseItems
-                    .Where(b => b.OwnerId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(b => b.OwnerId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                await context.AncestorIds
-                    .Where(a => a.ParentItemId == dupId
-                        && context.AncestorIds.Any(k => k.ParentItemId == keeperId && k.ItemId == a.ItemId))
-                    .ExecuteDeleteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-                await context.AncestorIds
-                    .Where(a => a.ParentItemId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(a => a.ParentItemId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                await context.LinkedChildren
-                    .Where(l => l.ParentId == dupId
-                        && context.LinkedChildren.Any(k => k.ParentId == keeperId && k.ChildId == l.ChildId))
-                    .ExecuteDeleteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-                await context.LinkedChildren
-                    .Where(l => l.ParentId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(l => l.ParentId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-                await context.LinkedChildren
-                    .Where(l => l.ChildId == dupId
-                        && context.LinkedChildren.Any(k => k.ChildId == keeperId && k.ParentId == l.ParentId))
-                    .ExecuteDeleteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-                await context.LinkedChildren
-                    .Where(l => l.ChildId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(l => l.ChildId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                await context.UserData
-                    .Where(u => u.ItemId == dupId
-                        && context.UserData.Any(k => k.ItemId == keeperId && k.UserId == u.UserId && k.CustomDataKey == u.CustomDataKey))
-                    .ExecuteDeleteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-                await context.UserData
-                    .Where(u => u.ItemId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(u => u.ItemId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                idsToDelete.Add(dupId);
-            }
-
-            _logger.LogDebug(
-                "Merged Person BaseItems for '{Name}' into {KeeperId} ({Removed} removed).",
-                keeper.Name,
-                keeper.Id,
-                stats.Count - 1);
-        }
-
-        if (idsToDelete.Count == 0)
-        {
-            return;
-        }
-
-        // Resolve via LibraryManager so DeleteItemsUnsafeFast can also remove the
-        // %MetadataPath%/People/<Letter>/<Name> directories the duplicate stubs left behind.
-        var itemsToDelete = idsToDelete
-            .Select(id => _libraryManager.GetItemById(id))
-            .Where(item => item is not null)
-            .ToList();
-        if (itemsToDelete.Count > 0)
-        {
-            _libraryManager.DeleteItemsUnsafeFast(itemsToDelete!);
-        }
-
-        var deletedIds = itemsToDelete.Select(i => i!.Id).ToHashSet();
-        var unresolvedIds = idsToDelete.Where(id => !deletedIds.Contains(id)).ToList();
-        if (unresolvedIds.Count > 0)
-        {
-            _persistenceService.DeleteItem(unresolvedIds);
-        }
-
-        _logger.LogInformation("Removed {Count} duplicate Person BaseItems.", idsToDelete.Count);
-    }
-
-    private async Task MergePeoplesRowsAsync(JellyfinDbContext context, CancellationToken cancellationToken)
-    {
-        var people = await context.Peoples
-            .Select(p => new { p.Id, p.Name, p.PersonType })
-            .ToListAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        var groups = people
-            .GroupBy(p => (Name: p.Name.ToLowerInvariant(), p.PersonType))
-            .Where(g => g.Count() > 1)
-            .ToList();
-
-        if (groups.Count == 0)
-        {
-            _logger.LogInformation("No case-only duplicate Peoples rows found.");
-            return;
-        }
-
-        _logger.LogInformation("Found {Count} groups of case-only duplicate Peoples rows.", groups.Count);
-
-        var idsToDelete = new List<Guid>();
-        foreach (var group in groups)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var groupIds = group.Select(g => g.Id).ToArray();
-
-            // Pick the keeper: the row referenced by the most BaseItems is the one most
-            // tracks/movies already point at; the duplicates are usually orphan stubs left
-            // by a casing-mismatched insert.
-            var stats = await context.Peoples
-                .Where(p => groupIds.Contains(p.Id))
-                .Select(p => new
-                {
-                    p.Id,
-                    p.Name,
-                    MapCount = context.PeopleBaseItemMap.Count(m => m.PeopleId == p.Id),
-                })
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            var keeper = stats
-                .OrderByDescending(s => s.MapCount)
-                .ThenBy(s => s.Id)
-                .First();
-
-            foreach (var dup in stats.Where(s => s.Id != keeper.Id))
-            {
-                var keeperId = keeper.Id;
-                var dupId = dup.Id;
-
-                // PeopleBaseItemMap PK is (ItemId, PeopleId, Role); drop dup rows that would
-                // collide on (ItemId, Role) before redirecting PeopleId. Role is nullable, so
-                // match nulls explicitly.
-                await context.PeopleBaseItemMap
-                    .Where(m => m.PeopleId == dupId
-                        && context.PeopleBaseItemMap.Any(k => k.PeopleId == keeperId
-                            && k.ItemId == m.ItemId
-                            && (k.Role == m.Role || (k.Role == null && m.Role == null))))
-                    .ExecuteDeleteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-                await context.PeopleBaseItemMap
-                    .Where(m => m.PeopleId == dupId)
-                    .ExecuteUpdateAsync(s => s.SetProperty(m => m.PeopleId, keeperId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                idsToDelete.Add(dupId);
-            }
-
-            _logger.LogDebug(
-                "Merged Peoples rows for '{Name}' into {KeeperId} ({Removed} removed).",
-                keeper.Name,
-                keeper.Id,
-                stats.Count - 1);
-        }
-
-        if (idsToDelete.Count == 0)
-        {
-            return;
-        }
-
-        await context.Peoples
-            .Where(p => idsToDelete.Contains(p.Id))
-            .ExecuteDeleteAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        _logger.LogInformation("Removed {Count} duplicate Peoples rows.", idsToDelete.Count);
-    }
-}
--- a/Jellyfin.Server/Migrations/Routines/MigrateLinkedChildren.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLinkedChildren.cs
@@ -7,7 +7,6 @@ using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -284,9 +283,9 @@ internal class MigrateLinkedChildren : IDatabaseMigrationRoutine
            .Select(id => _libraryManager.GetItemById(id))
            .Where(item => item is not null)
            .ToList();
-        var deleted = DeleteItems(itemsToDelete!);
+        _libraryManager.DeleteItemsUnsafeFast(itemsToDelete!);

-        _logger.LogInformation("Removed {Count} wrong-type alternate version items. They will be recreated with the correct type on next library scan.", deleted);
+        _logger.LogInformation("Removed {Count} wrong-type alternate version items. They will be recreated with the correct type on next library scan.", itemsToDelete.Count);
    }

    private void CleanupOrphanedAlternateVersionBaseItems(JellyfinDbContext context)
@@ -315,9 +314,9 @@ internal class MigrateLinkedChildren : IDatabaseMigrationRoutine
            .Select(id => _libraryManager.GetItemById(id))
            .Where(item => item is not null)
            .ToList();
-        var deleted = DeleteItems(itemsToDelete!);
+        _libraryManager.DeleteItemsUnsafeFast(itemsToDelete!);

-        _logger.LogInformation("Removed {Count} orphaned alternate version BaseItems.", deleted);
+        _logger.LogInformation("Removed {Count} orphaned alternate version BaseItems.", itemsToDelete.Count);
    }

    private void CleanupItemsFromDeletedLibraries(JellyfinDbContext context)
@@ -344,9 +343,9 @@ internal class MigrateLinkedChildren : IDatabaseMigrationRoutine
            .Select(id => _libraryManager.GetItemById(id))
            .Where(item => item is not null)
            .ToList();
-        var deleted = DeleteItems(itemsToDelete!);
+        _libraryManager.DeleteItemsUnsafeFast(itemsToDelete!);

-        _logger.LogInformation("Removed {Count} items from deleted libraries.", deleted);
+        _logger.LogInformation("Removed {Count} items from deleted libraries.", itemsToDelete.Count);
    }

    private void CleanupStaleFileEntries(JellyfinDbContext context)
@@ -432,34 +431,9 @@ internal class MigrateLinkedChildren : IDatabaseMigrationRoutine
            .Select(id => _libraryManager.GetItemById(id))
            .Where(item => item is not null)
            .ToList();
-        var deleted = DeleteItems(itemsToDelete!);
+        _libraryManager.DeleteItemsUnsafeFast(itemsToDelete!);

-        _logger.LogInformation("Removed {Count} stale items.", deleted);
-    }
-
-    private int DeleteItems(IReadOnlyCollection<BaseItem> items)
-    {
-        if (items.Count == 0)
-        {
-            return 0;
-        }
-
-        var options = new DeleteOptions { DeleteFileLocation = false, DeleteFromExternalProvider = false };
-        var deleted = 0;
-        foreach (var item in items)
-        {
-            try
-            {
-                _libraryManager.DeleteItem(item, options);
-                deleted++;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Skipping item {ItemId} ({ItemName}): delete failed.", item.Id, item.Name ?? "Unknown");
-            }
-        }
-
-        return deleted;
+        _logger.LogInformation("Removed {Count} stale items.", itemsToDelete.Count);
    }

    private void CleanupOrphanedLinkedChildren(JellyfinDbContext context)
--- a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Server.ServerSetupApp;
@@ -11,7 +12,7 @@ namespace Jellyfin.Server.Migrations.Routines;
 /// Migrate rating levels.
 /// </summary>
 #pragma warning disable CS0618 // Type or member is obsolete
-[JellyfinMigration("2026-03-02T09:00:00", nameof(MigrateRatingLevels))]
+[JellyfinMigration("2025-04-20T22:00:00", nameof(MigrateRatingLevels))]
 [JellyfinMigrationBackup(JellyfinDb = true)]
 #pragma warning restore CS0618 // Type or member is obsolete
 internal class MigrateRatingLevels : IDatabaseMigrationRoutine
--- a/Jellyfin.Server/Migrations/Routines/MoveExtractedFiles.cs
+++ b/Jellyfin.Server/Migrations/Routines/MoveExtractedFiles.cs
@@ -144,11 +144,6 @@ public class MoveExtractedFiles : IAsyncMigrationRoutine
                }

                var newSubtitleCachePath = _pathManager.GetSubtitlePath(itemIdString, mediaStreamIndex, extension);
-                if (newSubtitleCachePath is null)
-                {
-                    continue;
-                }
-
                if (File.Exists(newSubtitleCachePath))
                {
                    File.Delete(oldSubtitleCachePath);
@@ -187,11 +182,6 @@ public class MoveExtractedFiles : IAsyncMigrationRoutine
            }

            var newAttachmentPath = _pathManager.GetAttachmentPath(itemIdString, attachment.Filename ?? attachmentIndex.ToString(CultureInfo.InvariantCulture));
-            if (newAttachmentPath is null)
-            {
-                continue;
-            }
-
            if (File.Exists(newAttachmentPath))
            {
                File.Delete(oldAttachmentPath);
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -137,7 +137,7 @@ namespace Jellyfin.Server

            StartupHelpers.PerformStaticInitialization();

-            await ApplyStartupMigrationAsync(appPaths, startupConfig, options).ConfigureAwait(false);
+            await ApplyStartupMigrationAsync(appPaths, startupConfig).ConfigureAwait(false);

            do
            {
@@ -214,17 +214,13 @@ namespace Jellyfin.Server
                {
                    configurationCompleted = true;
                    await _setupServer!.StopAsync().ConfigureAwait(false);
+                    await _jellyfinHost.StartAsync().ConfigureAwait(false);

-                    if (options.StartupMode is null or Configuration.StartupMode.MediaServer)
+                    if (!OperatingSystem.IsWindows() && startupConfig.UseUnixSocket())
                    {
-                        await _jellyfinHost.StartAsync().ConfigureAwait(false);
+                        var socketPath = StartupHelpers.GetUnixSocketPath(startupConfig, appPaths);

-                        if (!OperatingSystem.IsWindows() && startupConfig.UseUnixSocket())
-                        {
-                            var socketPath = StartupHelpers.GetUnixSocketPath(startupConfig, appPaths);
-
-                            StartupHelpers.SetUnixSocketPermissions(startupConfig, socketPath, _logger);
-                        }
+                        StartupHelpers.SetUnixSocketPermissions(startupConfig, socketPath, _logger);
                    }
                }
                catch (Exception)
@@ -233,14 +229,11 @@ namespace Jellyfin.Server
                    throw;
                }

-                if (options.StartupMode is null or Configuration.StartupMode.MediaServer)
-                {
-                    await appHost.RunStartupTasksAsync().ConfigureAwait(false);
-                    _logger.LogInformation("Startup complete {Time:g}", Stopwatch.GetElapsedTime(_startTimestamp));
+                await appHost.RunStartupTasksAsync().ConfigureAwait(false);

-                    await _jellyfinHost.WaitForShutdownAsync().ConfigureAwait(false);
-                }
+                _logger.LogInformation("Startup complete {Time:g}", Stopwatch.GetElapsedTime(_startTimestamp));

+                await _jellyfinHost.WaitForShutdownAsync().ConfigureAwait(false);
                _restartOnShutdown = appHost.ShouldRestart;
                _restoreFromBackup = appHost.RestoreBackupPath;
            }
@@ -251,11 +244,7 @@ namespace Jellyfin.Server
                if (_setupServer!.IsAlive && !configurationCompleted)
                {
                    _setupServer!.SoftStop();
-                    if (options.StartupMode is null or Configuration.StartupMode.MediaServer)
-                    {
-                        await Task.Delay(TimeSpan.FromMinutes(10)).ConfigureAwait(false);
-                    }
-
+                    await Task.Delay(TimeSpan.FromMinutes(10)).ConfigureAwait(false);
                    await _setupServer!.StopAsync().ConfigureAwait(false);
                }
            }
@@ -286,9 +275,8 @@ namespace Jellyfin.Server
        /// </remarks>
        /// <param name="appPaths">Application Paths.</param>
        /// <param name="startupConfig">Startup Config.</param>
-        /// <param name="startupOptions">The applications startup options.</param>
        /// <returns>A task.</returns>
-        public static async Task ApplyStartupMigrationAsync(ServerApplicationPaths appPaths, IConfiguration startupConfig, StartupOptions startupOptions)
+        public static async Task ApplyStartupMigrationAsync(ServerApplicationPaths appPaths, IConfiguration startupConfig)
        {
            _migrationLogger = StartupLogger.Logger.BeginGroup<JellyfinMigrationService>($"Migration Service");
            var startupConfigurationManager = new ServerConfigurationManager(appPaths, _loggerFactory, new MyXmlSerializer());
@@ -306,7 +294,7 @@ namespace Jellyfin.Server
            PrepareDatabaseProvider(startupService);

            var jellyfinMigrationService = ActivatorUtilities.CreateInstance<JellyfinMigrationService>(startupService);
-            await jellyfinMigrationService.CheckFirstTimeRunOrMigration(appPaths, startupOptions).ConfigureAwait(false);
+            await jellyfinMigrationService.CheckFirstTimeRunOrMigration(appPaths).ConfigureAwait(false);
            await jellyfinMigrationService.MigrateStepAsync(Migrations.Stages.JellyfinMigrationStageTypes.PreInitialisation, startupService).ConfigureAwait(false);
        }

--- a/Jellyfin.Server/StartupOptions.cs
+++ b/Jellyfin.Server/StartupOptions.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using CommandLine;
 using Emby.Server.Implementations;
-using Jellyfin.Server.Configuration;
 using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;

 namespace Jellyfin.Server
@@ -80,13 +79,6 @@ namespace Jellyfin.Server
        [Option("restore-archive", Required = false, HelpText = "Path to a Jellyfin backup archive to restore from")]
        public string? RestoreArchive { get; set; }

-        /// <summary>
-        /// Gets or sets the mode of operation the server should perform when started.
-        /// Defaults to: <see cref="StartupMode.MediaServer"/>.
-        /// </summary>
-        [Option("mode", Required = false, HelpText = "Mode which selects what action the jellyfin server should perform when started.")]
-        public StartupMode? StartupMode { get; set; }
-
        /// <summary>
        /// Gets the command line options as a dictionary that can be used in the .NET configuration system.
        /// </summary>
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>12.0.0</VersionPrefix>
+    <VersionPrefix>10.12.0</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Common/Net/NetworkUtils.cs
+++ b/MediaBrowser.Common/Net/NetworkUtils.cs
@@ -7,7 +7,6 @@ using System.Net.Sockets;
 using System.Text.RegularExpressions;
 using Jellyfin.Extensions;
 using MediaBrowser.Model.Net;
-using Microsoft.Extensions.Logging;

 namespace MediaBrowser.Common.Net;

@@ -167,9 +166,8 @@ public static partial class NetworkUtils
    /// <param name="values">Input string array to be parsed.</param>
    /// <param name="result">Collection of <see cref="IPNetwork"/>.</param>
    /// <param name="negated">Boolean signaling if negated or not negated values should be parsed.</param>
-    /// <param name="logger">Optional logger used to warn about entries that fail to parse.</param>
    /// <returns><c>True</c> if parsing was successful.</returns>
-    public static bool TryParseToSubnets(string[] values, [NotNullWhen(true)] out IReadOnlyList<IPData>? result, bool negated = false, ILogger? logger = null)
+    public static bool TryParseToSubnets(string[] values, [NotNullWhen(true)] out IReadOnlyList<IPData>? result, bool negated = false)
    {
        if (values is null || values.Length == 0)
        {
@@ -184,45 +182,12 @@ public static partial class NetworkUtils
            {
                (tmpResult ??= new()).Add(innerResult);
            }
-            else
-            {
-                LogInvalidSubnet(logger, values[a]);
-            }
        }

        result = tmpResult;
        return result is not null;
    }

-    private static void LogInvalidSubnet(ILogger? logger, string value)
-    {
-        if (logger is null)
-        {
-            return;
-        }
-
-        var trimmed = value.AsSpan().Trim();
-        if (trimmed.StartsWith('!'))
-        {
-            trimmed = trimmed[1..];
-        }
-
-        var slash = trimmed.IndexOf('/');
-        if (slash != -1
-            && trimmed.Contains(':')
-            && trimmed.IndexOf("::", StringComparison.Ordinal) == -1)
-        {
-            logger.LogWarning(
-                "Invalid IPv6 subnet '{Subnet}': IPv6 prefix-only notation is not supported. Use the full notation including '::' (e.g. '{Example}::/{Prefix}').",
-                value,
-                trimmed[..slash].ToString(),
-                trimmed[(slash + 1)..].ToString());
-            return;
-        }
-
-        logger.LogWarning("Invalid subnet '{Subnet}' will be ignored.", value);
-    }
-
    /// <summary>
    /// Try parsing a string into an <see cref="IPData"/>, respecting exclusions.
    /// Inputs without a subnet mask will be represented as <see cref="IPData"/> with a single IP.
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -216,9 +216,6 @@ namespace MediaBrowser.Controller.Entities
        [JsonIgnore]
        public string OriginalTitle { get; set; }

-        [JsonIgnore]
-        public string OriginalLanguage { get; set; }
-
        /// <summary>
        /// Gets or sets the id.
        /// </summary>
--- a/MediaBrowser.Controller/IO/IPathManager.cs
+++ b/MediaBrowser.Controller/IO/IPathManager.cs
@@ -22,30 +22,30 @@ public interface IPathManager
    /// <param name="mediaSourceId">The media source id.</param>
    /// <param name="streamIndex">The stream index.</param>
    /// <param name="extension">The subtitle file extension.</param>
-    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
-    public string? GetSubtitlePath(string mediaSourceId, int streamIndex, string extension);
+    /// <returns>The absolute path.</returns>
+    public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension);

    /// <summary>
    /// Gets the path to the subtitle file.
    /// </summary>
    /// <param name="mediaSourceId">The media source id.</param>
-    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
-    public string? GetSubtitleFolderPath(string mediaSourceId);
+    /// <returns>The absolute path.</returns>
+    public string GetSubtitleFolderPath(string mediaSourceId);

    /// <summary>
    /// Gets the path to the attachment file.
    /// </summary>
    /// <param name="mediaSourceId">The media source id.</param>
    /// <param name="fileName">The attachmentFileName index.</param>
-    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
-    public string? GetAttachmentPath(string mediaSourceId, string fileName);
+    /// <returns>The absolute path.</returns>
+    public string GetAttachmentPath(string mediaSourceId, string fileName);

    /// <summary>
    /// Gets the path to the attachment folder.
    /// </summary>
    /// <param name="mediaSourceId">The media source id.</param>
-    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
-    public string? GetAttachmentFolderPath(string mediaSourceId);
+    /// <returns>The absolute path.</returns>
+    public string GetAttachmentFolderPath(string mediaSourceId);

    /// <summary>
    /// Gets the chapter images data path.
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -24,14 +24,14 @@ namespace MediaBrowser.Controller.Library
        /// <summary>
        /// Gets the users.
        /// </summary>
-        /// <returns>The users.</returns>
-        IEnumerable<User> GetUsers();
+        /// <value>The users.</value>
+        IEnumerable<User> Users { get; }

        /// <summary>
        /// Gets the user ids.
        /// </summary>
-        /// <returns>The users ids.</returns>
-        IEnumerable<Guid> GetUsersIds();
+        /// <value>The users ids.</value>
+        IEnumerable<Guid> UsersIds { get; }

        /// <summary>
        /// Initializes the user manager and ensures that a user exists.
@@ -47,12 +47,6 @@ namespace MediaBrowser.Controller.Library
        /// <exception cref="ArgumentException"><c>id</c> is an empty Guid.</exception>
        User? GetUserById(Guid id);

-        /// <summary>
-        /// Gets the first available user.
-        /// </summary>
-        /// <returns>The first user, or <c>null</c> if no users exist.</returns>
-        User? GetFirstUser();
-
        /// <summary>
        /// Gets the name of the user by.
        /// </summary>
@@ -63,13 +57,12 @@ namespace MediaBrowser.Controller.Library
        /// <summary>
        /// Renames the user.
        /// </summary>
-        /// <param name="userId">The UserId to change.</param>
-        /// <param name="oldName">The old Username.</param>
+        /// <param name="user">The user.</param>
        /// <param name="newName">The new name.</param>
        /// <returns>Task.</returns>
        /// <exception cref="ArgumentNullException">If user is <c>null</c>.</exception>
        /// <exception cref="ArgumentException">If the provided user doesn't exist.</exception>
-        Task RenameUser(Guid userId, string oldName, string newName);
+        Task RenameUser(User user, string newName);

        /// <summary>
        /// Updates the user.
@@ -99,17 +92,17 @@ namespace MediaBrowser.Controller.Library
        /// <summary>
        /// Resets the password.
        /// </summary>
-        /// <param name="userId">The users Id.</param>
+        /// <param name="user">The user.</param>
        /// <returns>Task.</returns>
-        Task ResetPassword(Guid userId);
+        Task ResetPassword(User user);

        /// <summary>
        /// Changes the password.
        /// </summary>
-        /// <param name="userId">The users id.</param>
+        /// <param name="user">The user.</param>
        /// <param name="newPassword">New password to use.</param>
        /// <returns>Awaitable task.</returns>
-        Task ChangePassword(Guid userId, string newPassword);
+        Task ChangePassword(User user, string newPassword);

        /// <summary>
        /// Gets the user dto.
--- a/MediaBrowser.Controller/LiveTv/ISchedulesDirectService.cs
+++ b/MediaBrowser.Controller/LiveTv/ISchedulesDirectService.cs
@@ -1,31 +0,0 @@
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.LiveTv;
-
-/// <summary>
-/// Provides Schedules Direct specific operations.
-/// </summary>
-public interface ISchedulesDirectService
-{
-    /// <summary>
-    /// Gets the available countries from the Schedules Direct API, using a file cache.
-    /// </summary>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    /// <returns>A stream containing the raw JSON response.</returns>
-    Task<Stream> GetAvailableCountries(CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Gets a value indicating whether the Schedules Direct daily image download limit is currently active.
-    /// </summary>
-    /// <returns><c>true</c> if the image limit has been hit and has not yet reset; otherwise <c>false</c>.</returns>
-    bool IsImageDailyLimitActive();
-
-    /// <summary>
-    /// Gets a value indicating whether the Schedules Direct service is available.
-    /// Returns <c>false</c> if a permanent account error has occurred or a transient backoff is active.
-    /// </summary>
-    /// <returns><c>true</c> if the service can accept requests; otherwise <c>false</c>.</returns>
-    bool IsServiceAvailable();
-}
--- a/MediaBrowser.Controller/LiveTv/ITunerHostManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ITunerHostManager.cs
@@ -37,12 +37,6 @@ public interface ITunerHostManager
    /// <returns>The <see cref="TunerHostInfo"/>s.</returns>
    IAsyncEnumerable<TunerHostInfo> DiscoverTuners(bool newDevicesOnly);

-    /// <summary>
-    /// Deletes a tuner host by id, cleans up associated caches, and triggers a guide refresh.
-    /// </summary>
-    /// <param name="id">The tuner host id to delete.</param>
-    void DeleteTunerHost(string? id);
-
    /// <summary>
    /// Scans for tuner devices that have changed URLs.
    /// </summary>
--- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
@@ -109,7 +109,7 @@ namespace MediaBrowser.Controller.LiveTv
        {
            if (double.TryParse(Number, CultureInfo.InvariantCulture, out double number))
            {
-                return string.Format(CultureInfo.InvariantCulture, "{0:0000000000.00000}", number) + "-" + (Name ?? string.Empty);
+                return string.Format(CultureInfo.InvariantCulture, "{0:00000.0}", number) + "-" + (Name ?? string.Empty);
            }

            return (Number ?? string.Empty) + "-" + (Name ?? string.Empty);
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>12.0.0</VersionPrefix>
+    <VersionPrefix>10.12.0</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
@@ -91,12 +91,6 @@ namespace MediaBrowser.Controller.MediaEncoding
        /// <value>The codec tag.</value>
        public string CodecTag { get; set; }

-        /// <summary>
-        /// Gets or sets the rotation.
-        /// </summary>
-        /// <value>The video rotation angle, usually 0 or +-90/180.</value>
-        public string Rotation { get; set; }
-
        /// <summary>
        /// Gets or sets the framerate.
        /// </summary>
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1645,9 +1645,10 @@ namespace MediaBrowser.Controller.MediaEncoding
            }

            if (string.Equals(videoCodec, "h264_amf", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(videoCodec, "hevc_amf", StringComparison.OrdinalIgnoreCase))
+                || string.Equals(videoCodec, "hevc_amf", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(videoCodec, "av1_amf", StringComparison.OrdinalIgnoreCase))
            {
-                // Override the too high default qmin 18 in transcoding preset in legacy h26x_amf
+                // Override the too high default qmin 18 in transcoding preset
                return FormattableString.Invariant($" -rc cbr -qmin 0 -qmax 32 -b:v {bitrate} -maxrate {bitrate} -bufsize {bufsize}");
            }

@@ -1879,12 +1880,10 @@ namespace MediaBrowser.Controller.MediaEncoding
            var sub2videoParam = enableSub2video ? ":sub2video=1" : string.Empty;

            var fontPath = _pathManager.GetAttachmentFolderPath(state.MediaSource.Id);
-            var fontParam = fontPath is null
-                ? string.Empty
-                : string.Format(
-                    CultureInfo.InvariantCulture,
-                    ":fontsdir='{0}'",
-                    _mediaEncoder.EscapeSubtitleFilterPath(fontPath));
+            var fontParam = string.Format(
+                CultureInfo.InvariantCulture,
+                ":fontsdir='{0}'",
+                _mediaEncoder.EscapeSubtitleFilterPath(fontPath));

            if (state.SubtitleStream.IsExternal)
            {
@@ -2467,17 +2466,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                }
            }

-            var requestedRotations = state.GetRequestedRotations(videoStream.Codec);
-            if (requestedRotations.Length > 0)
-            {
-                var rotation = state.VideoStream?.Rotation ?? 0;
-                if (rotation != 0
-                    && !requestedRotations.Contains(rotation.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal))
-                {
-                    return false;
-                }
-            }
-
            // Video width must fall within requested value
            if (request.MaxWidth.HasValue
                && (!videoStream.Width.HasValue || videoStream.Width.Value > request.MaxWidth.Value))
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -571,50 +571,62 @@ namespace MediaBrowser.Controller.MediaEncoding

        public string[] GetRequestedProfiles(string codec)
        {
-            var profile = BaseRequest.Profile;
-
-            if (string.IsNullOrEmpty(profile) && !string.IsNullOrEmpty(codec))
+            if (!string.IsNullOrEmpty(BaseRequest.Profile))
            {
-                profile = BaseRequest.GetOption(codec, "profile");
+                return BaseRequest.Profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
            }

-            return (profile ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+            if (!string.IsNullOrEmpty(codec))
+            {
+                var profile = BaseRequest.GetOption(codec, "profile");
+
+                if (!string.IsNullOrEmpty(profile))
+                {
+                    return profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                }
+            }
+
+            return Array.Empty<string>();
        }

        public string[] GetRequestedRangeTypes(string codec)
        {
-            var rangetype = BaseRequest.VideoRangeType;
-
-            if (string.IsNullOrEmpty(rangetype) && !string.IsNullOrEmpty(codec))
+            if (!string.IsNullOrEmpty(BaseRequest.VideoRangeType))
            {
-                rangetype = BaseRequest.GetOption(codec, "rangetype");
+                return BaseRequest.VideoRangeType.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
            }

-            return (rangetype ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+            if (!string.IsNullOrEmpty(codec))
+            {
+                var rangetype = BaseRequest.GetOption(codec, "rangetype");
+
+                if (!string.IsNullOrEmpty(rangetype))
+                {
+                    return rangetype.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                }
+            }
+
+            return Array.Empty<string>();
        }

        public string[] GetRequestedCodecTags(string codec)
        {
-            var codectag = BaseRequest.CodecTag;
-
-            if (string.IsNullOrEmpty(codectag) && !string.IsNullOrEmpty(codec))
+            if (!string.IsNullOrEmpty(BaseRequest.CodecTag))
            {
-                codectag = BaseRequest.GetOption(codec, "codectag");
+                return BaseRequest.CodecTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
            }

-            return (codectag ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-        }
-
-        public string[] GetRequestedRotations(string codec)
-        {
-            var rotation = BaseRequest.Rotation;
-
-            if (string.IsNullOrEmpty(rotation) && !string.IsNullOrEmpty(codec))
+            if (!string.IsNullOrEmpty(codec))
            {
-                rotation = BaseRequest.GetOption(codec, "rotation");
+                var codectag = BaseRequest.GetOption(codec, "codectag");
+
+                if (!string.IsNullOrEmpty(codectag))
+                {
+                    return codectag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                }
            }

-            return (rotation ?? string.Empty).Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+            return Array.Empty<string>();
        }

        public string GetRequestedLevel(string codec)
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -40,6 +40,11 @@ namespace MediaBrowser.Controller.Net
        /// </summary>
        private readonly List<(IWebSocketConnection Connection, CancellationTokenSource CancellationTokenSource, TStateType State)> _activeConnections = new();

+        /// <summary>
+        /// The logger.
+        /// </summary>
+        protected readonly ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> Logger;
+
        private readonly Task _messageConsumerTask;

        protected BasePeriodicWebSocketListener(ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> logger)
@@ -51,11 +56,6 @@ namespace MediaBrowser.Controller.Net
            _messageConsumerTask = HandleMessages();
        }

-        /// <summary>
-        /// Gets the Logger.
-        /// </summary>
-        protected ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> Logger { get; }
-
        /// <summary>
        /// Gets the type used for the messages sent to the client.
        /// </summary>
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -105,7 +105,7 @@ namespace MediaBrowser.Controller.Providers
        public IReadOnlyList<string> GetFilePaths(string path)
            => GetFilePaths(path, false);

-        public IReadOnlyList<string> GetFilePaths(string path, bool clearCache)
+        public IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false)
        {
            if (clearCache)
            {
@@ -118,7 +118,7 @@ namespace MediaBrowser.Controller.Providers
                {
                    try
                    {
-                        return fileSystem.GetFilePaths(p).OrderBy(x => x).ToList();
+                        return fileSystem.GetFilePaths(p).ToList();
                    }
                    catch (DirectoryNotFoundException)
                    {
@@ -127,6 +127,11 @@ namespace MediaBrowser.Controller.Providers
                },
                _fileSystem);

+            if (sort)
+            {
+                filePaths.Sort();
+            }
+
            return filePaths;
        }

--- a/MediaBrowser.Controller/Providers/IDirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/IDirectoryService.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Providers

        IReadOnlyList<string> GetFilePaths(string path);

-        IReadOnlyList<string> GetFilePaths(string path, bool clearCache);
+        IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false);

        bool IsAccessible(string path);
    }
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -129,12 +129,6 @@ namespace MediaBrowser.MediaEncoding.Attachments
            ArgumentException.ThrowIfNullOrEmpty(inputPath);

            var outputFolder = _pathManager.GetAttachmentFolderPath(mediaSource.Id);
-            if (outputFolder is null)
-            {
-                _logger.LogDebug("Skipping attachment extraction for input {InputFile}: MediaSource Id is not a GUID.", inputFile);
-                return;
-            }
-
            using (await _semaphoreLocks.LockAsync(outputFolder, cancellationToken).ConfigureAwait(false))
            {
                var directory = Directory.CreateDirectory(outputFolder);
@@ -247,14 +241,9 @@ namespace MediaBrowser.MediaEncoding.Attachments
            CancellationToken cancellationToken)
        {
            var attachmentFolderPath = _pathManager.GetAttachmentFolderPath(mediaSource.Id);
-            if (attachmentFolderPath is null)
-            {
-                throw new ResourceNotFoundException($"MediaSource {mediaSource.Id} has no attachment cache (non-GUID Id, e.g. Live TV stream).");
-            }
-
            using (await _semaphoreLocks.LockAsync(attachmentFolderPath, cancellationToken).ConfigureAwait(false))
            {
-                var attachmentPath = _pathManager.GetAttachmentPath(mediaSource.Id, mediaAttachment.FileName ?? mediaAttachment.Index.ToString(CultureInfo.InvariantCulture))!;
+                var attachmentPath = _pathManager.GetAttachmentPath(mediaSource.Id, mediaAttachment.FileName ?? mediaAttachment.Index.ToString(CultureInfo.InvariantCulture));
                if (!File.Exists(attachmentPath))
                {
                    await ExtractAttachmentInternal(
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -729,7 +729,6 @@ namespace MediaBrowser.MediaEncoding.Probing
                stream.Type = MediaStreamType.Audio;
                stream.LocalizedDefault = _localization.GetLocalizedString("Default");
                stream.LocalizedExternal = _localization.GetLocalizedString("External");
-                stream.LocalizedOriginal = _localization.GetLocalizedString("Original");
                stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language)
                    ? null
                    : _localization.FindLanguageInfo(stream.Language)?.DisplayName;
@@ -1032,11 +1031,6 @@ namespace MediaBrowser.MediaEncoding.Probing
                {
                    stream.IsHearingImpaired = true;
                }
-
-                if (disposition.GetValueOrDefault("original") == 1)
-                {
-                    stream.IsOriginal = true;
-                }
            }

            NormalizeStreamTitle(stream);
@@ -1708,13 +1702,6 @@ namespace MediaBrowser.MediaEncoding.Probing
                return;
            }

-            // Skip timestamp extration for remote resource (http, rtsp, etc.)
-            // as they cannot be opened with FileStream
-            if (video.Protocol != MediaProtocol.File)
-            {
-                return;
-            }
-
            if (!string.Equals(video.Container, "mpeg2ts", StringComparison.OrdinalIgnoreCase)
                && !string.Equals(video.Container, "m2ts", StringComparison.OrdinalIgnoreCase)
                && !string.Equals(video.Container, "ts", StringComparison.OrdinalIgnoreCase))
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -212,8 +212,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                var outputFileExtension = GetExtractableSubtitleFileExtension(subtitleStream);
                var outputFormat = GetExtractableSubtitleFormat(subtitleStream);
-                var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + outputFileExtension)
-                    ?? throw new ResourceNotFoundException($"MediaSource {mediaSource.Id} has no subtitle cache (non-GUID Id, e.g. Live TV stream).");
+                var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + outputFileExtension);

                return new SubtitleInfo()
                {
@@ -243,8 +242,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            if (!_subtitleParser.SupportsFileExtension(currentFormat))
            {
                // Convert
-                var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, ".srt")
-                    ?? throw new ResourceNotFoundException($"MediaSource {mediaSource.Id} has no subtitle cache (non-GUID Id, e.g. Live TV stream).");
+                var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, ".srt");

                await ConvertTextSubtitleToSrt(subtitleStream, mediaSource, outputPath, cancellationToken).ConfigureAwait(false);

@@ -522,10 +520,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                    }

                    var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + GetExtractableSubtitleFileExtension(subtitleStream));
-                    if (outputPath is null)
-                    {
-                        continue;
-                    }

                    var releaser = await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false);

@@ -597,11 +591,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                    }

                    var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + GetExtractableSubtitleFileExtension(subtitleStream));
-                    if (outputPath is null)
-                    {
-                        continue;
-                    }
-
                    var outputCodec = IsCodecCopyable(subtitleStream.Codec) ? "copy" : "srt";
                    var streamIndex = EncodingHelper.FindIndex(mediaSource.MediaStreams, subtitleStream);

@@ -647,11 +636,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                }

                var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + GetExtractableSubtitleFileExtension(subtitleStream));
-                if (outputPath is null)
-                {
-                    continue;
-                }
-
                var outputCodec = IsCodecCopyable(subtitleStream.Codec) ? "copy" : "srt";
                var streamIndex = EncodingHelper.FindIndex(mediaSource.MediaStreams, subtitleStream);

@@ -984,7 +968,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            }
        }

-        private string? GetSubtitleCachePath(MediaSourceInfo mediaSource, int subtitleStreamIndex, string outputSubtitleExtension)
+        private string GetSubtitleCachePath(MediaSourceInfo mediaSource, int subtitleStreamIndex, string outputSubtitleExtension)
        {
            return _pathManager.GetSubtitlePath(mediaSource.Id, subtitleStreamIndex, outputSubtitleExtension);
        }
@@ -997,13 +981,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles

            if (path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase))
            {
-                var cachePath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + subtitleCodec);
-                if (cachePath is not null)
-                {
-                    path = cachePath;
-                    await ExtractTextSubtitle(mediaSource, subtitleStream, subtitleCodec, path, cancellationToken)
-                        .ConfigureAwait(false);
-                }
+                path = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + subtitleCodec);
+                await ExtractTextSubtitle(mediaSource, subtitleStream, subtitleCodec, path, cancellationToken)
+                    .ConfigureAwait(false);
            }

            var result = await DetectCharset(path, mediaSource.Protocol, cancellationToken).ConfigureAwait(false);
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -287,5 +287,5 @@ public class ServerConfiguration : BaseApplicationConfiguration
    /// <summary>
    /// Gets or sets a value indicating whether old authorization methods are allowed.
    /// </summary>
-    public bool EnableLegacyAuthorization { get; set; } = true;
+    public bool EnableLegacyAuthorization { get; set; }
 }
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -33,7 +33,6 @@ namespace MediaBrowser.Model.Dlna
        /// <param name="numAudioStreams">The number of audio streams.</param>
        /// <param name="videoCodecTag">The video codec tag.</param>
        /// <param name="isAvc">A value indicating whether the video is AVC.</param>
-        /// <param name="videoRotation">The video rotation angle, usually 0 or +-90/180.</param>
        /// <returns><b>True</b> if the condition is satisfied.</returns>
        public static bool IsVideoConditionSatisfied(
            ProfileCondition condition,
@@ -54,8 +53,7 @@ namespace MediaBrowser.Model.Dlna
            int? numVideoStreams,
            int? numAudioStreams,
            string? videoCodecTag,
-            bool? isAvc,
-            int? videoRotation)
+            bool? isAvc)
        {
            switch (condition.Property)
            {
@@ -95,8 +93,6 @@ namespace MediaBrowser.Model.Dlna
                    return IsConditionSatisfied(condition, numVideoStreams);
                case ProfileConditionValue.VideoTimestamp:
                    return IsConditionSatisfied(condition, timestamp);
-                case ProfileConditionValue.VideoRotation:
-                    return IsConditionSatisfied(condition, videoRotation);
                default:
                    return true;
            }
--- a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
+++ b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
@@ -28,7 +28,6 @@ namespace MediaBrowser.Model.Dlna
        AudioSampleRate = 22,
        AudioBitDepth = 23,
        VideoRangeType = 24,
-        NumStreams = 25,
-        VideoRotation = 26
+        NumStreams = 25
    }
 }
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Model.Dlna
        internal const TranscodeReason ContainerReasons = TranscodeReason.ContainerNotSupported | TranscodeReason.ContainerBitrateExceedsLimit;
        internal const TranscodeReason AudioCodecReasons = TranscodeReason.AudioBitrateNotSupported | TranscodeReason.AudioChannelsNotSupported | TranscodeReason.AudioProfileNotSupported | TranscodeReason.AudioSampleRateNotSupported | TranscodeReason.SecondaryAudioNotSupported | TranscodeReason.AudioBitDepthNotSupported | TranscodeReason.AudioIsExternal;
        internal const TranscodeReason AudioReasons = TranscodeReason.AudioCodecNotSupported | AudioCodecReasons;
-        internal const TranscodeReason VideoCodecReasons = TranscodeReason.VideoResolutionNotSupported | TranscodeReason.AnamorphicVideoNotSupported | TranscodeReason.InterlacedVideoNotSupported | TranscodeReason.VideoBitDepthNotSupported | TranscodeReason.VideoBitrateNotSupported | TranscodeReason.VideoFramerateNotSupported | TranscodeReason.VideoLevelNotSupported | TranscodeReason.RefFramesNotSupported | TranscodeReason.VideoRangeTypeNotSupported | TranscodeReason.VideoProfileNotSupported | TranscodeReason.VideoRotationNotSupported;
+        internal const TranscodeReason VideoCodecReasons = TranscodeReason.VideoResolutionNotSupported | TranscodeReason.AnamorphicVideoNotSupported | TranscodeReason.InterlacedVideoNotSupported | TranscodeReason.VideoBitDepthNotSupported | TranscodeReason.VideoBitrateNotSupported | TranscodeReason.VideoFramerateNotSupported | TranscodeReason.VideoLevelNotSupported | TranscodeReason.RefFramesNotSupported | TranscodeReason.VideoRangeTypeNotSupported | TranscodeReason.VideoProfileNotSupported;
        internal const TranscodeReason VideoReasons = TranscodeReason.VideoCodecNotSupported | VideoCodecReasons;
        internal const TranscodeReason DirectStreamReasons = AudioReasons | TranscodeReason.ContainerNotSupported | TranscodeReason.VideoCodecTagNotSupported;

@@ -380,9 +380,6 @@ namespace MediaBrowser.Model.Dlna
                case ProfileConditionValue.VideoRangeType:
                    return TranscodeReason.VideoRangeTypeNotSupported;

-                case ProfileConditionValue.VideoRotation:
-                    return TranscodeReason.VideoRotationNotSupported;
-
                case ProfileConditionValue.VideoTimestamp:
                    // TODO
                    return 0;
@@ -1043,7 +1040,6 @@ namespace MediaBrowser.Model.Dlna
            bool? isInterlaced = videoStream?.IsInterlaced;
            string? videoCodecTag = videoStream?.CodecTag;
            bool? isAvc = videoStream?.IsAVC;
-            int? videoRotation = videoStream?.Rotation;

            TransportStreamTimestamp? timestamp = videoStream is null ? TransportStreamTimestamp.None : item.Timestamp;
            int? packetLength = videoStream?.PacketLength;
@@ -1058,7 +1054,7 @@ namespace MediaBrowser.Model.Dlna
            var appliedVideoConditions = options.Profile.CodecProfiles
                .Where(i => i.Type == CodecType.Video &&
                    i.ContainsAnyCodec(playlistItem.VideoCodecs, container, useSubContainer) &&
-                    i.ApplyConditions.All(applyCondition => ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoRangeType, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numStreams, numVideoStreams, numAudioStreams, videoCodecTag, isAvc, videoRotation)))
+                    i.ApplyConditions.All(applyCondition => ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoRangeType, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numStreams, numVideoStreams, numAudioStreams, videoCodecTag, isAvc)))
                // Reverse codec profiles for backward compatibility - first codec profile has higher priority
                .Reverse();
            foreach (var condition in appliedVideoConditions)
@@ -2063,38 +2059,6 @@ namespace MediaBrowser.Model.Dlna
                            break;
                        }

-                    case ProfileConditionValue.VideoRotation:
-                        {
-                            if (string.IsNullOrEmpty(qualifier))
-                            {
-                                continue;
-                            }
-
-                            // change from split by | to comma
-                            // strip spaces to avoid having to encode
-                            var values = value
-                                .Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-
-                            if (condition.Condition == ProfileConditionType.Equals)
-                            {
-                                item.SetOption(qualifier, "rotation", string.Join(',', values));
-                            }
-                            else if (condition.Condition == ProfileConditionType.EqualsAny)
-                            {
-                                var currentValue = item.GetOption(qualifier, "rotation");
-                                if (!string.IsNullOrEmpty(currentValue) && values.Any(v => string.Equals(v, currentValue, StringComparison.OrdinalIgnoreCase)))
-                                {
-                                    item.SetOption(qualifier, "rotation", currentValue);
-                                }
-                                else
-                                {
-                                    item.SetOption(qualifier, "rotation", string.Join(',', values));
-                                }
-                            }
-
-                            break;
-                        }
-
                    case ProfileConditionValue.Height:
                        {
                            if (!enableNonQualifiedConditions)
@@ -2317,7 +2281,6 @@ namespace MediaBrowser.Model.Dlna
            bool? isInterlaced = videoStream?.IsInterlaced;
            string? videoCodecTag = videoStream?.CodecTag;
            bool? isAvc = videoStream?.IsAVC;
-            int? videoRotation = videoStream?.Rotation;

            TransportStreamTimestamp? timestamp = videoStream is null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
            int? packetLength = videoStream?.PacketLength;
@@ -2327,7 +2290,7 @@ namespace MediaBrowser.Model.Dlna
            int? numAudioStreams = mediaSource.GetStreamCount(MediaStreamType.Audio);
            int? numVideoStreams = mediaSource.GetStreamCount(MediaStreamType.Video);

-            return conditions.Where(applyCondition => !ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoRangeType, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numStreams, numVideoStreams, numAudioStreams, videoCodecTag, isAvc, videoRotation));
+            return conditions.Where(applyCondition => !ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoRangeType, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numStreams, numVideoStreams, numAudioStreams, videoCodecTag, isAvc));
        }

        /// <summary>
--- a/MediaBrowser.Model/Drawing/ImageDimensions.cs
+++ b/MediaBrowser.Model/Drawing/ImageDimensions.cs
@@ -1,5 +1,4 @@
 #pragma warning disable CS1591
-#pragma warning disable CA1815

 using System.Globalization;

--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -800,7 +800,5 @@ namespace MediaBrowser.Model.Dto
        /// </summary>
        /// <value>The current program.</value>
        public BaseItemDto CurrentProgram { get; set; }
-
-        public string OriginalLanguage { get; set; }
    }
 }
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -260,8 +260,6 @@ namespace MediaBrowser.Model.Entities

        public string LocalizedLanguage { get; set; }

-        public string LocalizedOriginal { get; set; }
-
        public string DisplayTitle
        {
            get
@@ -269,166 +267,161 @@ namespace MediaBrowser.Model.Entities
                switch (Type)
                {
                    case MediaStreamType.Audio:
+                    {
+                        var attributes = new List<string>();
+
+                        // Do not display the language code in display titles if unset or set to a special code. Show it in all other cases (possibly expanded).
+                        if (!string.IsNullOrEmpty(Language) && !_specialCodes.Contains(Language, StringComparison.OrdinalIgnoreCase))
                        {
-                            var attributes = new List<string>();
-
-                            // Do not display the language code in display titles if unset or set to a special code. Show it in all other cases (possibly expanded).
-                            if (!string.IsNullOrEmpty(Language) && !_specialCodes.Contains(Language, StringComparison.OrdinalIgnoreCase))
-                            {
-                                // Use pre-resolved localized language name, falling back to raw language code.
-                                attributes.Add(StringHelper.FirstToUpper(LocalizedLanguage ?? Language));
-                            }
-
-                            if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
-                            {
-                                attributes.Add(Profile);
-                            }
-                            else if (!string.IsNullOrEmpty(Codec))
-                            {
-                                attributes.Add(AudioCodec.GetFriendlyName(Codec));
-                            }
-
-                            if (!string.IsNullOrEmpty(ChannelLayout))
-                            {
-                                attributes.Add(StringHelper.FirstToUpper(ChannelLayout));
-                            }
-                            else if (Channels.HasValue)
-                            {
-                                attributes.Add(Channels.Value.ToString(CultureInfo.InvariantCulture) + " ch");
-                            }
-
-                            if (IsDefault)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedDefault) ? "Default" : LocalizedDefault);
-                            }
-
-                            if (IsExternal)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedExternal) ? "External" : LocalizedExternal);
-                            }
-
-                            if (IsOriginal)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedOriginal) ? "Original" : LocalizedOriginal);
-                            }
-
-                            if (!string.IsNullOrEmpty(Title))
-                            {
-                                var result = new StringBuilder(Title);
-                                foreach (var tag in attributes)
-                                {
-                                    // Keep Tags that are not already in Title.
-                                    if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        result.Append(" - ").Append(tag);
-                                    }
-                                }
-
-                                return result.ToString();
-                            }
-
-                            return string.Join(" - ", attributes);
+                            // Use pre-resolved localized language name, falling back to raw language code.
+                            attributes.Add(StringHelper.FirstToUpper(LocalizedLanguage ?? Language));
                        }

+                        if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
+                        {
+                            attributes.Add(Profile);
+                        }
+                        else if (!string.IsNullOrEmpty(Codec))
+                        {
+                            attributes.Add(AudioCodec.GetFriendlyName(Codec));
+                        }
+
+                        if (!string.IsNullOrEmpty(ChannelLayout))
+                        {
+                            attributes.Add(StringHelper.FirstToUpper(ChannelLayout));
+                        }
+                        else if (Channels.HasValue)
+                        {
+                            attributes.Add(Channels.Value.ToString(CultureInfo.InvariantCulture) + " ch");
+                        }
+
+                        if (IsDefault)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedDefault) ? "Default" : LocalizedDefault);
+                        }
+
+                        if (IsExternal)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedExternal) ? "External" : LocalizedExternal);
+                        }
+
+                        if (!string.IsNullOrEmpty(Title))
+                        {
+                            var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
+                        }
+
+                        return string.Join(" - ", attributes);
+                    }
+
                    case MediaStreamType.Video:
+                    {
+                        var attributes = new List<string>();
+
+                        var resolutionText = GetResolutionText();
+
+                        if (!string.IsNullOrEmpty(resolutionText))
                        {
-                            var attributes = new List<string>();
-
-                            var resolutionText = GetResolutionText();
-
-                            if (!string.IsNullOrEmpty(resolutionText))
-                            {
-                                attributes.Add(resolutionText);
-                            }
-
-                            if (!string.IsNullOrEmpty(Codec))
-                            {
-                                attributes.Add(Codec.ToUpperInvariant());
-                            }
-
-                            if (VideoDoViTitle is not null)
-                            {
-                                attributes.Add(VideoDoViTitle);
-                            }
-                            else if (VideoRange != VideoRange.Unknown)
-                            {
-                                attributes.Add(VideoRange.ToString());
-                            }
-
-                            if (!string.IsNullOrEmpty(Title))
-                            {
-                                var result = new StringBuilder(Title);
-                                foreach (var tag in attributes)
-                                {
-                                    // Keep Tags that are not already in Title.
-                                    if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        result.Append(" - ").Append(tag);
-                                    }
-                                }
-
-                                return result.ToString();
-                            }
-
-                            return string.Join(' ', attributes);
+                            attributes.Add(resolutionText);
                        }

+                        if (!string.IsNullOrEmpty(Codec))
+                        {
+                            attributes.Add(Codec.ToUpperInvariant());
+                        }
+
+                        if (VideoDoViTitle is not null)
+                        {
+                            attributes.Add(VideoDoViTitle);
+                        }
+                        else if (VideoRange != VideoRange.Unknown)
+                        {
+                            attributes.Add(VideoRange.ToString());
+                        }
+
+                        if (!string.IsNullOrEmpty(Title))
+                        {
+                            var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
+                        }
+
+                        return string.Join(' ', attributes);
+                    }
+
                    case MediaStreamType.Subtitle:
+                    {
+                        var attributes = new List<string>();
+
+                        if (!string.IsNullOrEmpty(Language))
                        {
-                            var attributes = new List<string>();
-
-                            if (!string.IsNullOrEmpty(Language))
-                            {
-                                // Use pre-resolved localized language name, falling back to raw language code.
-                                attributes.Add(StringHelper.FirstToUpper(LocalizedLanguage ?? Language));
-                            }
-                            else
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedUndefined) ? "Und" : LocalizedUndefined);
-                            }
-
-                            if (IsHearingImpaired == true)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedHearingImpaired) ? "Hearing Impaired" : LocalizedHearingImpaired);
-                            }
-
-                            if (IsDefault)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedDefault) ? "Default" : LocalizedDefault);
-                            }
-
-                            if (IsForced)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedForced) ? "Forced" : LocalizedForced);
-                            }
-
-                            if (!string.IsNullOrEmpty(Codec))
-                            {
-                                attributes.Add(Codec.ToUpperInvariant());
-                            }
-
-                            if (IsExternal)
-                            {
-                                attributes.Add(string.IsNullOrEmpty(LocalizedExternal) ? "External" : LocalizedExternal);
-                            }
-
-                            if (!string.IsNullOrEmpty(Title))
-                            {
-                                var result = new StringBuilder(Title);
-                                foreach (var tag in attributes)
-                                {
-                                    // Keep Tags that are not already in Title.
-                                    if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        result.Append(" - ").Append(tag);
-                                    }
-                                }
-
-                                return result.ToString();
-                            }
-
-                            return string.Join(" - ", attributes);
+                            // Use pre-resolved localized language name, falling back to raw language code.
+                            attributes.Add(StringHelper.FirstToUpper(LocalizedLanguage ?? Language));
                        }
+                        else
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedUndefined) ? "Und" : LocalizedUndefined);
+                        }
+
+                        if (IsHearingImpaired == true)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedHearingImpaired) ? "Hearing Impaired" : LocalizedHearingImpaired);
+                        }
+
+                        if (IsDefault)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedDefault) ? "Default" : LocalizedDefault);
+                        }
+
+                        if (IsForced)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedForced) ? "Forced" : LocalizedForced);
+                        }
+
+                        if (!string.IsNullOrEmpty(Codec))
+                        {
+                            attributes.Add(Codec.ToUpperInvariant());
+                        }
+
+                        if (IsExternal)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(LocalizedExternal) ? "External" : LocalizedExternal);
+                        }
+
+                        if (!string.IsNullOrEmpty(Title))
+                        {
+                            var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
+                        }
+
+                        return string.Join(" - ", attributes);
+                    }

                    default:
                        return null;
@@ -506,12 +499,6 @@ namespace MediaBrowser.Model.Entities
        /// <value><c>true</c> if this instance is for the hearing impaired; otherwise, <c>false</c>.</value>
        public bool IsHearingImpaired { get; set; }

-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is original.
-        /// </summary>
-        /// <value><c>true</c> if this instance is original; otherwise, <c>false</c>.</value>
-        public bool IsOriginal { get; set; }
-
        /// <summary>
        /// Gets or sets the height.
        /// </summary>
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>12.0.0</VersionPrefix>
+    <VersionPrefix>10.12.0</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Model/Session/TranscodeReason.cs
+++ b/MediaBrowser.Model/Session/TranscodeReason.cs
@@ -24,7 +24,6 @@ namespace MediaBrowser.Model.Session
        VideoResolutionNotSupported = 1 << 8,
        VideoBitDepthNotSupported = 1 << 9,
        VideoFramerateNotSupported = 1 << 10,
-        VideoRotationNotSupported = 1 << 27,
        RefFramesNotSupported = 1 << 11,
        AnamorphicVideoNotSupported = 1 << 12,
        InterlacedVideoNotSupported = 1 << 13,
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -1023,11 +1023,6 @@ namespace MediaBrowser.Providers.Manager
                target.OriginalTitle = source.OriginalTitle;
            }

-            if (replaceData || string.IsNullOrEmpty(target.OriginalLanguage))
-            {
-                target.OriginalLanguage = source.OriginalLanguage;
-            }
-
            if (replaceData || !target.CommunityRating.HasValue)
            {
                target.CommunityRating = source.CommunityRating;
--- a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
@@ -218,12 +218,12 @@ namespace MediaBrowser.Providers.MediaInfo
                return Array.Empty<ExternalPathParserResult>();
            }

-            var files = directoryService.GetFilePaths(folder, clearCache).ToList();
+            var files = directoryService.GetFilePaths(folder, clearCache, true).ToList();
            files.Remove(video.Path);
            var internalMetadataPath = video.GetInternalMetadataPath();
            if (_fileSystem.DirectoryExists(internalMetadataPath))
            {
-                files.AddRange(directoryService.GetFilePaths(internalMetadataPath, clearCache));
+                files.AddRange(directoryService.GetFilePaths(internalMetadataPath, clearCache, true));
            }

            if (files.Count == 0)
@@ -270,12 +270,12 @@ namespace MediaBrowser.Providers.MediaInfo
            }

            string folder = audio.ContainingFolderPath;
-            var files = directoryService.GetFilePaths(folder, clearCache).ToList();
+            var files = directoryService.GetFilePaths(folder, clearCache, true).ToList();
            files.Remove(audio.Path);
            var internalMetadataPath = audio.GetInternalMetadataPath();
            if (_fileSystem.DirectoryExists(internalMetadataPath))
            {
-                files.AddRange(directoryService.GetFilePaths(internalMetadataPath, clearCache));
+                files.AddRange(directoryService.GetFilePaths(internalMetadataPath, clearCache, true));
            }

            if (files.Count == 0)
--- a/MediaBrowser.Providers/Movies/ImdbExternalUrlProvider.cs
+++ b/MediaBrowser.Providers/Movies/ImdbExternalUrlProvider.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;

@@ -18,18 +17,6 @@ public class ImdbExternalUrlProvider : IExternalUrlProvider
    public IEnumerable<string> GetExternalUrls(BaseItem item)
    {
        var baseUrl = "https://www.imdb.com/";
-
-        if (item is Season season)
-        {
-            if (season.Series?.TryGetProviderId(MetadataProvider.Imdb, out var seriesImdbId) == true
-                && season.IndexNumber.HasValue)
-            {
-                yield return baseUrl + $"title/{seriesImdbId}/episodes/?season={season.IndexNumber.Value}";
-            }
-
-            yield break;
-        }
-
        if (item.TryGetProviderId(MetadataProvider.Imdb, out var externalId))
        {
            if (item is Person)
--- a/Show More
+++ b/Show More