Merge branch 'master' into Plugins

52 files changed, 494 insertions, 907 deletions

diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index 9dab5e77b..d5344494e 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -4,7 +4,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
-using MediaBrowser.Model.Events;
+using Jellyfin.Data.Events;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
@@ -13,8 +13,6 @@ namespace MediaBrowser.Model.Activity
     {
         event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
 
-        void Create(ActivityLog entry);
-
         Task CreateAsync(ActivityLog entry);
 
         QueryResult<ActivityLogEntry> GetPagedResult(int? startIndex, int? limit);
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 54f4fb293..b00d2fffb 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -12,7 +12,15 @@ namespace MediaBrowser.Model.Configuration
     public class BaseApplicationConfiguration
     {
         /// <summary>
-        /// The number of days we should retain log files.
+        /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
+        /// </summary>
+        public BaseApplicationConfiguration()
+        {
+            LogFileRetentionDays = 3;
+        }
+
+        /// <summary>
+        /// Gets or sets the number of days we should retain log files.
         /// </summary>
         /// <value>The log file retention days.</value>
         public int LogFileRetentionDays { get; set; }
@@ -30,29 +38,27 @@ namespace MediaBrowser.Model.Configuration
         public string CachePath { get; set; }
 
         /// <summary>
-        /// Last known version that was ran using the configuration.
+        /// Gets or sets the last known version that was ran using the configuration.
         /// </summary>
         /// <value>The version from previous run.</value>
         [XmlIgnore]
         public Version PreviousVersion { get; set; }
 
         /// <summary>
-        /// Stringified PreviousVersion to be stored/loaded,
-        /// because System.Version itself isn't xml-serializable
+        /// Gets or sets the stringified PreviousVersion to be stored/loaded,
+        /// because System.Version itself isn't xml-serializable.
         /// </summary>
-        /// <value>String value of PreviousVersion</value>
+        /// <value>String value of PreviousVersion.</value>
         public string PreviousVersionStr
         {
             get => PreviousVersion?.ToString();
-            set => PreviousVersion = Version.Parse(value);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
-        /// </summary>
-        public BaseApplicationConfiguration()
-        {
-            LogFileRetentionDays = 3;
+            set
+            {
+                if (Version.TryParse(value, out var version))
+                {
+                    PreviousVersion = version;
+                }
+            }
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 9a30f7e9f..2cd637c5b 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -11,6 +11,8 @@ namespace MediaBrowser.Model.Configuration
 
         public double DownMixAudioBoost { get; set; }
 
+        public int MaxMuxingQueueSize { get; set; }
+
         public bool EnableThrottling { get; set; }
 
         public int ThrottleDelaySeconds { get; set; }
@@ -29,12 +31,30 @@ namespace MediaBrowser.Model.Configuration
 
         public string VaapiDevice { get; set; }
 
+        public string OpenclDevice { get; set; }
+
+        public bool EnableTonemapping { get; set; }
+
+        public string TonemappingAlgorithm { get; set; }
+
+        public string TonemappingRange { get; set; }
+
+        public double TonemappingDesat { get; set; }
+
+        public double TonemappingThreshold { get; set; }
+
+        public double TonemappingPeak { get; set; }
+
+        public double TonemappingParam { get; set; }
+
         public int H264Crf { get; set; }
 
         public int H265Crf { get; set; }
 
         public string EncoderPreset { get; set; }
 
+        public bool DeinterlaceDoubleRate { get; set; }
+
         public string DeinterlaceMethod { get; set; }
 
         public bool EnableDecodingColorDepth10Hevc { get; set; }
@@ -50,13 +70,26 @@ namespace MediaBrowser.Model.Configuration
         public EncodingOptions()
         {
             DownMixAudioBoost = 2;
+            MaxMuxingQueueSize = 2048;
             EnableThrottling = false;
             ThrottleDelaySeconds = 180;
             EncodingThreadCount = -1;
-            // This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything
+            // This is a DRM device that is almost guaranteed to be there on every intel platform,
+            // plus it's the default one in ffmpeg if you don't specify anything
             VaapiDevice = "/dev/dri/renderD128";
+            // This is the OpenCL device that is used for tonemapping.
+            // The left side of the dot is the platform number, and the right side is the device number on the platform.
+            OpenclDevice = "0.0";
+            EnableTonemapping = false;
+            TonemappingAlgorithm = "reinhard";
+            TonemappingRange = "auto";
+            TonemappingDesat = 0;
+            TonemappingThreshold = 0.8;
+            TonemappingPeak = 0;
+            TonemappingParam = 0;
             H264Crf = 23;
             H265Crf = 28;
+            DeinterlaceDoubleRate = false;
             DeinterlaceMethod = "yadif";
             EnableDecodingColorDepth10Hevc = true;
             EnableDecodingColorDepth10Vp9 = true;
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 742887620..97748bd0c 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -2,7 +2,9 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Collections.Generic;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -76,12 +78,15 @@ namespace MediaBrowser.Model.Configuration
         /// <value><c>true</c> if this instance is port authorized; otherwise, <c>false</c>.</value>
         public bool IsPortAuthorized { get; set; }
 
+        /// <summary>
+        /// Gets or sets if quick connect is available for use on this server.
+        /// </summary>
+        public bool QuickConnectAvailable { get; set; }
+
         public bool AutoRunWebApp { get; set; }
 
         public bool EnableRemoteAccess { get; set; }
 
-        public bool CollectionsUpgraded { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether [enable case sensitive item ids].
         /// </summary>
@@ -162,12 +167,6 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableDashboardResponseCaching { get; set; }
 
         /// <summary>
-        /// Gets or sets a custom path to serve the dashboard from.
-        /// </summary>
-        /// <value>The dashboard source path, or null if the default path should be used.</value>
-        public string DashboardSourcePath { get; set; }
-
-        /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>
         /// <value>The image saving convention.</value>
@@ -229,6 +228,8 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] CodecsUsed { get; set; }
 
+        public List<RepositoryInfo> PluginRepositories { get; set; }
+
         public bool IgnoreVirtualInterfaces { get; set; }
 
         public bool EnableExternalContentInSuggestions { get; set; }
@@ -253,6 +254,16 @@ namespace MediaBrowser.Model.Configuration
         public string[] UninstalledPlugins { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether slow server responses should be logged as a warning.
+        /// </summary>
+        public bool EnableSlowResponseWarning { get; set; }
+
+        /// <summary>
+        /// Gets or sets the threshold for the slow response time warning in ms.
+        /// </summary>
+        public long SlowResponseThresholdMs { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
         public ServerConfiguration()
@@ -265,6 +276,9 @@ namespace MediaBrowser.Model.Configuration
             PathSubstitutions = Array.Empty<PathSubstitution>();
             IgnoreVirtualInterfaces = false;
             EnableSimpleArtistDetection = false;
+            SkipDeserializationForBasicTypes = true;
+
+            PluginRepositories = new List<RepositoryInfo>();
 
             DisplaySpecialsWithinSeasons = true;
             EnableExternalContentInSuggestions = true;
@@ -278,9 +292,13 @@ namespace MediaBrowser.Model.Configuration
             EnableHttps = false;
             EnableDashboardResponseCaching = true;
             EnableCaseSensitiveItemIds = true;
+            EnableNormalizedItemByNameIds = true;
+            DisableLiveTvChannelUserDataName = true;
+            EnableNewOmdbSupport = true;
 
             AutoRunWebApp = true;
             EnableRemoteAccess = true;
+            QuickConnectAvailable = false;
 
             EnableUPnP = false;
             MinResumePct = 5;
@@ -351,6 +369,9 @@ namespace MediaBrowser.Model.Configuration
                     DisabledImageFetchers = new[] { "The Open Movie Database", "TheMovieDb" }
                 }
             };
+
+            EnableSlowResponseWarning = true;
+            SlowResponseThresholdMs = 500;
         }
     }
 
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index a579f8464..93e60753a 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -157,7 +157,7 @@ namespace MediaBrowser.Model.Dlna
             //    flagValue = flagValue | DlnaFlags.TimeBasedSeek;
             //}
 
-            string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
+            string dlnaflags = string.Format(CultureInfo.InvariantCulture, ";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
             ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container,
diff --git a/MediaBrowser.Model/Dlna/DlnaMaps.cs b/MediaBrowser.Model/Dlna/DlnaMaps.cs
index 052b4b78b..95cd0ac27 100644
--- a/MediaBrowser.Model/Dlna/DlnaMaps.cs
+++ b/MediaBrowser.Model/Dlna/DlnaMaps.cs
@@ -1,18 +1,20 @@
 #pragma warning disable CS1591
 
+using System.Globalization;
+
 namespace MediaBrowser.Model.Dlna
 {
     public static class DlnaMaps
     {
         private static readonly string DefaultStreaming =
-             FlagsToString(DlnaFlags.StreamingTransferMode |
+            FlagsToString(DlnaFlags.StreamingTransferMode |
                            DlnaFlags.BackgroundTransferMode |
                            DlnaFlags.ConnectionStall |
                            DlnaFlags.ByteBasedSeek |
                            DlnaFlags.DlnaV15);
 
         private static readonly string DefaultInteractive =
-          FlagsToString(DlnaFlags.InteractiveTransferMode |
+            FlagsToString(DlnaFlags.InteractiveTransferMode |
                         DlnaFlags.BackgroundTransferMode |
                         DlnaFlags.ConnectionStall |
                         DlnaFlags.ByteBasedSeek |
@@ -20,7 +22,7 @@ namespace MediaBrowser.Model.Dlna
 
         public static string FlagsToString(DlnaFlags flags)
         {
-            return string.Format("{0:X8}{1:D24}", (ulong)flags, 0);
+            return string.Format(CultureInfo.InvariantCulture, "{0:X8}{1:D24}", (ulong)flags, 0);
         }
 
         public static string GetOrgOpValue(bool hasKnownRuntime, bool isDirectStream, TranscodeSeekInfo profileTranscodeSeekInfo)
diff --git a/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs b/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
index 76c9a4b04..05209e53d 100644
--- a/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
+++ b/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
@@ -1,7 +1,7 @@
 #pragma warning disable CS1591
 
 using System;
-using MediaBrowser.Model.Events;
+using Jellyfin.Data.Events;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index 398c5db8c..3c955989a 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using MediaBrowser.Model.MediaInfo;
 
@@ -142,26 +143,26 @@ namespace MediaBrowser.Model.Dlna
                 {
                     if (timestampType == TransportStreamTimestamp.None)
                     {
-                        return new MediaFormatProfile[] { ValueOf(string.Format("AVC_TS_HP_{0}D_MPEG1_L2_ISO", resolution)) };
+                        return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "AVC_TS_HP_{0}D_MPEG1_L2_ISO", resolution)) };
                     }
 
-                    return new MediaFormatProfile[] { ValueOf(string.Format("AVC_TS_HP_{0}D_MPEG1_L2_T", resolution)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "AVC_TS_HP_{0}D_MPEG1_L2_T", resolution)) };
                 }
 
                 if (string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("AVC_TS_MP_{0}D_AAC_MULT5{1}", resolution, suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "AVC_TS_MP_{0}D_AAC_MULT5{1}", resolution, suffix)) };
                 }
 
                 if (string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("AVC_TS_MP_{0}D_MPEG1_L3{1}", resolution, suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "AVC_TS_MP_{0}D_MPEG1_L3{1}", resolution, suffix)) };
                 }
 
                 if (string.IsNullOrEmpty(audioCodec) ||
                     string.Equals(audioCodec, "ac3", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("AVC_TS_MP_{0}D_AC3{1}", resolution, suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "AVC_TS_MP_{0}D_AC3{1}", resolution, suffix)) };
                 }
             }
             else if (string.Equals(videoCodec, "vc1", StringComparison.OrdinalIgnoreCase))
@@ -180,33 +181,33 @@ namespace MediaBrowser.Model.Dlna
                 {
                     suffix = string.Equals(suffix, "_ISO", StringComparison.OrdinalIgnoreCase) ? suffix : "_T";
 
-                    return new MediaFormatProfile[] { ValueOf(string.Format("VC1_TS_HD_DTS{0}", suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "VC1_TS_HD_DTS{0}", suffix)) };
                 }
             }
             else if (string.Equals(videoCodec, "mpeg4", StringComparison.OrdinalIgnoreCase) || string.Equals(videoCodec, "msmpeg4", StringComparison.OrdinalIgnoreCase))
             {
                 if (string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("MPEG4_P2_TS_ASP_AAC{0}", suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "MPEG4_P2_TS_ASP_AAC{0}", suffix)) };
                 }
 
                 if (string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("MPEG4_P2_TS_ASP_MPEG1_L3{0}", suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "MPEG4_P2_TS_ASP_MPEG1_L3{0}", suffix)) };
                 }
 
                 if (string.Equals(audioCodec, "mp2", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("MPEG4_P2_TS_ASP_MPEG2_L2{0}", suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "MPEG4_P2_TS_ASP_MPEG2_L2{0}", suffix)) };
                 }
 
                 if (string.Equals(audioCodec, "ac3", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new MediaFormatProfile[] { ValueOf(string.Format("MPEG4_P2_TS_ASP_AC3{0}", suffix)) };
+                    return new MediaFormatProfile[] { ValueOf(string.Format(CultureInfo.InvariantCulture, "MPEG4_P2_TS_ASP_AC3{0}", suffix)) };
                 }
             }
 
-            return new MediaFormatProfile[] { };
+            return Array.Empty<MediaFormatProfile>();
         }
 
         private MediaFormatProfile ValueOf(string value)
diff --git a/MediaBrowser.Model/Dlna/SortCriteria.cs b/MediaBrowser.Model/Dlna/SortCriteria.cs
index 1f7fa76ad..53e4540cb 100644
--- a/MediaBrowser.Model/Dlna/SortCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SortCriteria.cs
@@ -1,6 +1,6 @@
 #pragma warning disable CS1591
 
-using MediaBrowser.Model.Entities;
+using Jellyfin.Data.Enums;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index b89e9ce90..94d53ab70 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -144,7 +144,7 @@ namespace MediaBrowser.Model.Dlna
 
         public Dictionary<string, string> StreamOptions { get; private set; }
 
-        public string MediaSourceId => MediaSource == null ? null : MediaSource.Id;
+        public string MediaSourceId => MediaSource?.Id;
 
         public bool IsDirectStream =>
             PlayMethod == PlayMethod.DirectStream ||
@@ -191,7 +191,7 @@ namespace MediaBrowser.Model.Dlna
 
                 var encodedValue = pair.Value.Replace(" ", "%20");
 
-                list.Add(string.Format("{0}={1}", pair.Name, encodedValue));
+                list.Add(string.Format(CultureInfo.InvariantCulture, "{0}={1}", pair.Name, encodedValue));
             }
 
             string queryString = string.Join("&", list.ToArray());
@@ -214,18 +214,18 @@ namespace MediaBrowser.Model.Dlna
             {
                 if (string.Equals(SubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
                 {
-                    return string.Format("{0}/audio/{1}/master.m3u8?{2}", baseUrl, ItemId, queryString);
+                    return string.Format(CultureInfo.InvariantCulture, "{0}/audio/{1}/master.m3u8?{2}", baseUrl, ItemId, queryString);
                 }
 
-                return string.Format("{0}/audio/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
+                return string.Format(CultureInfo.InvariantCulture, "{0}/audio/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
             }
 
             if (string.Equals(SubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
             {
-                return string.Format("{0}/videos/{1}/master.m3u8?{2}", baseUrl, ItemId, queryString);
+                return string.Format(CultureInfo.InvariantCulture, "{0}/videos/{1}/master.m3u8?{2}", baseUrl, ItemId, queryString);
             }
 
-            return string.Format("{0}/videos/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
+            return string.Format(CultureInfo.InvariantCulture, "{0}/videos/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
         }
 
         private static List<NameValuePair> BuildParams(StreamInfo item, string accessToken)
@@ -457,7 +457,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 if (MediaSource.Protocol == MediaProtocol.File || !string.Equals(stream.Codec, subtitleProfile.Format, StringComparison.OrdinalIgnoreCase) || !stream.IsExternal)
                 {
-                    info.Url = string.Format("{0}/Videos/{1}/{2}/Subtitles/{3}/{4}/Stream.{5}",
+                    info.Url = string.Format(CultureInfo.InvariantCulture, "{0}/Videos/{1}/{2}/Subtitles/{3}/{4}/Stream.{5}",
                         baseUrl,
                         ItemId,
                         MediaSourceId,
@@ -813,18 +813,18 @@ namespace MediaBrowser.Model.Dlna
             {
                 var stream = TargetAudioStream;
 
-                string inputCodec = stream == null ? null : stream.Codec;
+                string inputCodec = stream?.Codec;
 
                 if (IsDirectStream)
                 {
-                    return string.IsNullOrEmpty(inputCodec) ? new string[] { } : new[] { inputCodec };
+                    return string.IsNullOrEmpty(inputCodec) ? Array.Empty<string>() : new[] { inputCodec };
                 }
 
                 foreach (string codec in AudioCodecs)
                 {
                     if (string.Equals(codec, inputCodec, StringComparison.OrdinalIgnoreCase))
                     {
-                        return string.IsNullOrEmpty(codec) ? new string[] { } : new[] { codec };
+                        return string.IsNullOrEmpty(codec) ? Array.Empty<string>() : new[] { codec };
                     }
                 }
 
@@ -838,18 +838,18 @@ namespace MediaBrowser.Model.Dlna
             {
                 var stream = TargetVideoStream;
 
-                string inputCodec = stream == null ? null : stream.Codec;
+                string inputCodec = stream?.Codec;
 
                 if (IsDirectStream)
                 {
-                    return string.IsNullOrEmpty(inputCodec) ? new string[] { } : new[] { inputCodec };
+                    return string.IsNullOrEmpty(inputCodec) ? Array.Empty<string>() : new[] { inputCodec };
                 }
 
                 foreach (string codec in VideoCodecs)
                 {
                     if (string.Equals(codec, inputCodec, StringComparison.OrdinalIgnoreCase))
                     {
-                        return string.IsNullOrEmpty(codec) ? new string[] { } : new[] { codec };
+                        return string.IsNullOrEmpty(codec) ? Array.Empty<string>() : new[] { codec };
                     }
                 }
 
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferencesDto.cs
index 7e5c5be3b..1f7fe3030 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferencesDto.cs
@@ -1,22 +1,18 @@
 #nullable disable
 using System.Collections.Generic;
+using Jellyfin.Data.Enums;
 
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Defines the display preferences for any item that supports them (usually Folders).
     /// </summary>
-    public class DisplayPreferences
+    public class DisplayPreferencesDto
     {
         /// <summary>
-        /// The image scale.
+        /// Initializes a new instance of the <see cref="DisplayPreferencesDto" /> class.
         /// </summary>
-        private const double ImageScale = .9;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisplayPreferences" /> class.
-        /// </summary>
-        public DisplayPreferences()
+        public DisplayPreferencesDto()
         {
             RememberIndexing = false;
             PrimaryImageHeight = 250;
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 7a488005e..2d37618c2 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -36,6 +36,18 @@ namespace MediaBrowser.Model.Entities
         public string Language { get; set; }
 
         /// <summary>
+        /// Gets or sets the color range.
+        /// </summary>
+        /// <value>The color range.</value>
+        public string ColorRange { get; set; }
+
+        /// <summary>
+        /// Gets or sets the color space.
+        /// </summary>
+        /// <value>The color space.</value>
+        public string ColorSpace { get; set; }
+
+        /// <summary>
         /// Gets or sets the color transfer.
         /// </summary>
         /// <value>The color transfer.</value>
@@ -48,12 +60,6 @@ namespace MediaBrowser.Model.Entities
         public string ColorPrimaries { get; set; }
 
         /// <summary>
-        /// Gets or sets the color space.
-        /// </summary>
-        /// <value>The color space.</value>
-        public string ColorSpace { get; set; }
-
-        /// <summary>
         /// Gets or sets the comment.
         /// </summary>
         /// <value>The comment.</value>
@@ -112,107 +118,146 @@ namespace MediaBrowser.Model.Entities
         {
             get
             {
-                if (Type == MediaStreamType.Audio)
-                {
-                    // if (!string.IsNullOrEmpty(Title))
-                    //{
-                    //    return AddLanguageIfNeeded(Title);
-                    //}
-
-                    var attributes = new List<string>();
-
-                    if (!string.IsNullOrEmpty(Language))
-                    {
-                        attributes.Add(StringHelper.FirstToUpper(Language));
-                    }
-
-                    if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase))
-                    {
-                        attributes.Add(AudioCodec.GetFriendlyName(Codec));
-                    }
-                    else if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
-                    {
-                        attributes.Add(Profile);
-                    }
-
-                    if (!string.IsNullOrEmpty(ChannelLayout))
-                    {
-                        attributes.Add(ChannelLayout);
-                    }
-                    else if (Channels.HasValue)
-                    {
-                        attributes.Add(Channels.Value.ToString(CultureInfo.InvariantCulture) + " ch");
-                    }
-
-                    if (IsDefault)
-                    {
-                        attributes.Add("Default");
-                    }
-
-                    return string.Join(" ", attributes);
-                }
-
-                if (Type == MediaStreamType.Video)
+                switch (Type)
                 {
-                    var attributes = new List<string>();
-
-                    var resolutionText = GetResolutionText();
-
-                    if (!string.IsNullOrEmpty(resolutionText))
+                    case MediaStreamType.Audio:
                     {
-                        attributes.Add(resolutionText);
+                        var attributes = new List<string>();
+
+                        if (!string.IsNullOrEmpty(Language))
+                        {
+                            // Get full language string i.e. eng -> English. Will not work for some languages which use ISO 639-2/B instead of /T codes.
+                            string fullLanguage = CultureInfo
+                                .GetCultures(CultureTypes.NeutralCultures)
+                                .FirstOrDefault(r => r.ThreeLetterISOLanguageName.Equals(Language, StringComparison.OrdinalIgnoreCase))
+                                ?.DisplayName;
+                            attributes.Add(StringHelper.FirstToUpper(fullLanguage ?? Language));
+                        }
+
+                        if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase))
+                        {
+                            attributes.Add(AudioCodec.GetFriendlyName(Codec));
+                        }
+                        else if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
+                        {
+                            attributes.Add(Profile);
+                        }
+
+                        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 (!string.IsNullOrEmpty(Title))
+                        {
+                            var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
+                        }
+
+                        return string.Join(" - ", attributes);
                     }
 
-                    if (!string.IsNullOrEmpty(Codec))
+                    case MediaStreamType.Video:
                     {
-                        attributes.Add(Codec.ToUpperInvariant());
+                        var attributes = new List<string>();
+
+                        var resolutionText = GetResolutionText();
+
+                        if (!string.IsNullOrEmpty(resolutionText))
+                        {
+                            attributes.Add(resolutionText);
+                        }
+
+                        if (!string.IsNullOrEmpty(Codec))
+                        {
+                            attributes.Add(Codec.ToUpperInvariant());
+                        }
+
+                        if (!string.IsNullOrEmpty(Title))
+                        {
+                            var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
+                        }
+
+                        return string.Join(" ", attributes);
                     }
 
-                    return string.Join(" ", attributes);
-                }
-
-                if (Type == MediaStreamType.Subtitle)
-                {
-
-                    var attributes = new List<string>();
-
-                    if (!string.IsNullOrEmpty(Language))
+                    case MediaStreamType.Subtitle:
                     {
-                        attributes.Add(StringHelper.FirstToUpper(Language));
-                    }
-                    else
-                    {
-                        attributes.Add(string.IsNullOrEmpty(localizedUndefined) ? "Und" : localizedUndefined);
-                    }
-
-                    if (IsDefault)
-                    {
-                        attributes.Add(string.IsNullOrEmpty(localizedDefault) ? "Default" : localizedDefault);
-                    }
-
-                    if (IsForced)
-                    {
-                        attributes.Add(string.IsNullOrEmpty(localizedForced) ? "Forced" : localizedForced);
+                        var attributes = new List<string>();
+
+                        if (!string.IsNullOrEmpty(Language))
+                        {
+                            // Get full language string i.e. eng -> English. Will not work for some languages which use ISO 639-2/B instead of /T codes.
+                            string fullLanguage = CultureInfo
+                                .GetCultures(CultureTypes.NeutralCultures)
+                                .FirstOrDefault(r => r.ThreeLetterISOLanguageName.Equals(Language, StringComparison.OrdinalIgnoreCase))
+                                ?.DisplayName;
+                            attributes.Add(StringHelper.FirstToUpper(fullLanguage ?? Language));
+                        }
+                        else
+                        {
+                            attributes.Add(string.IsNullOrEmpty(localizedUndefined) ? "Und" : localizedUndefined);
+                        }
+
+                        if (IsDefault)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(localizedDefault) ? "Default" : localizedDefault);
+                        }
+
+                        if (IsForced)
+                        {
+                            attributes.Add(string.IsNullOrEmpty(localizedForced) ? "Forced" : localizedForced);
+                        }
+
+                        if (!string.IsNullOrEmpty(Title))
+                        {
+                            var result = new StringBuilder(Title);
+                            foreach (var tag in attributes)
+                            {
+                                // Keep Tags that are not already in Title.
+                                if (Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
+                                {
+                                    result.Append(" - ").Append(tag);
+                                }
+                            }
+
+                            return result.ToString();
+                        }
+
+                        return string.Join(" - ", attributes);
                     }
 
-                    if (!string.IsNullOrEmpty(Title))
-                    {
-                        return attributes.AsEnumerable()
-                        // keep Tags that are not already in Title
-                        .Where(tag => Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
-                        // attributes concatenation, starting with Title
-                        .Aggregate(new StringBuilder(Title), (builder, attr) => builder.Append(" - ").Append(attr))
-                        .ToString();
-                    }
-
-                    return string.Join(" - ", attributes.ToArray());
+                    default:
+                        return null;
                 }
-
-                if (Type == MediaStreamType.Video)
-                {
-                }
-
-                return null;
             }
         }
 
diff --git a/MediaBrowser.Model/Entities/ScrollDirection.cs b/MediaBrowser.Model/Entities/ScrollDirection.cs
deleted file mode 100644
index a1de0edcb..000000000
--- a/MediaBrowser.Model/Entities/ScrollDirection.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace MediaBrowser.Model.Entities
-{
-    /// <summary>
-    /// Enum ScrollDirection.
-    /// </summary>
-    public enum ScrollDirection
-    {
-        /// <summary>
-        /// The horizontal.
-        /// </summary>
-        Horizontal,
-
-        /// <summary>
-        /// The vertical.
-        /// </summary>
-        Vertical
-    }
-}
diff --git a/MediaBrowser.Model/Entities/SortOrder.cs b/MediaBrowser.Model/Entities/SortOrder.cs
deleted file mode 100644
index f3abc06f3..000000000
--- a/MediaBrowser.Model/Entities/SortOrder.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace MediaBrowser.Model.Entities
-{
-    /// <summary>
-    /// Enum SortOrder.
-    /// </summary>
-    public enum SortOrder
-    {
-        /// <summary>
-        /// The ascending.
-        /// </summary>
-        Ascending,
-
-        /// <summary>
-        /// The descending.
-        /// </summary>
-        Descending
-    }
-}
diff --git a/MediaBrowser.Model/Events/GenericEventArgs.cs b/MediaBrowser.Model/Events/GenericEventArgs.cs
deleted file mode 100644
index 44f60f811..000000000
--- a/MediaBrowser.Model/Events/GenericEventArgs.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.Events
-{
-    /// <summary>
-    /// Provides a generic EventArgs subclass that can hold any kind of object.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class GenericEventArgs<T> : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the argument.
-        /// </summary>
-        /// <value>The argument.</value>
-        public T Argument { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericEventArgs{T}"/> class.
-        /// </summary>
-        /// <param name="arg">The argument.</param>
-        public GenericEventArgs(T arg)
-        {
-            Argument = arg;
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Extensions/ListHelper.cs b/MediaBrowser.Model/Extensions/ListHelper.cs
deleted file mode 100644
index b893a3509..000000000
--- a/MediaBrowser.Model/Extensions/ListHelper.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Model.Extensions
-{
-    // TODO: @bond remove
-    public static class ListHelper
-    {
-        public static bool ContainsIgnoreCase(string[] list, string value)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
-            foreach (var item in list)
-            {
-                if (string.Equals(item, value, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/MediaBrowser.Model/IO/FileSystemMetadata.cs b/MediaBrowser.Model/IO/FileSystemMetadata.cs
index b23119d08..118c78e80 100644
--- a/MediaBrowser.Model/IO/FileSystemMetadata.cs
+++ b/MediaBrowser.Model/IO/FileSystemMetadata.cs
@@ -56,7 +56,7 @@ namespace MediaBrowser.Model.IO
         public DateTime CreationTimeUtc { get; set; }
 
         /// <summary>
-        /// Gets a value indicating whether this instance is directory.
+        /// Gets or sets a value indicating whether this instance is directory.
         /// </summary>
         /// <value><c>true</c> if this instance is directory; otherwise, <c>false</c>.</value>
         public bool IsDirectory { get; set; }
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index bba69d4b4..dc6549787 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -201,9 +201,9 @@ namespace MediaBrowser.Model.IO
         IEnumerable<string> GetFileSystemEntryPaths(string path, bool recursive = false);
 
         void SetHidden(string path, bool isHidden);
-        void SetReadOnly(string path, bool readOnly);
+
         void SetAttributes(string path, bool isHidden, bool readOnly);
+
         List<FileSystemMetadata> GetDrives();
-        void SetExecutable(string path);
     }
 }
diff --git a/MediaBrowser.Model/IO/IODefaults.cs b/MediaBrowser.Model/IO/IODefaults.cs
index f392dbcce..d9a1e6777 100644
--- a/MediaBrowser.Model/IO/IODefaults.cs
+++ b/MediaBrowser.Model/IO/IODefaults.cs
@@ -1,3 +1,5 @@
+using System.IO;
+
 namespace MediaBrowser.Model.IO
 {
     /// <summary>
@@ -14,5 +16,10 @@ namespace MediaBrowser.Model.IO
         /// The default file stream buffer size.
         /// </summary>
         public const int FileStreamBufferSize = 4096;
+
+        /// <summary>
+        /// The default <see cref="StreamWriter" /> buffer size.
+        /// </summary>
+        public const int StreamWriterBufferSize = 1024;
     }
 }
diff --git a/MediaBrowser.Model/IO/IShortcutHandler.cs b/MediaBrowser.Model/IO/IShortcutHandler.cs
index 5c663aa0d..14d5c4b62 100644
--- a/MediaBrowser.Model/IO/IShortcutHandler.cs
+++ b/MediaBrowser.Model/IO/IShortcutHandler.cs
@@ -22,7 +22,6 @@ namespace MediaBrowser.Model.IO
         /// </summary>
         /// <param name="shortcutPath">The shortcut path.</param>
         /// <param name="targetPath">The target path.</param>
-        /// <returns>System.String.</returns>
         void Create(string shortcutPath, string targetPath);
     }
 }
diff --git a/MediaBrowser.Model/IO/IStreamHelper.cs b/MediaBrowser.Model/IO/IStreamHelper.cs
index af5ba5b17..0e09db16e 100644
--- a/MediaBrowser.Model/IO/IStreamHelper.cs
+++ b/MediaBrowser.Model/IO/IStreamHelper.cs
@@ -13,8 +13,6 @@ namespace MediaBrowser.Model.IO
 
         Task CopyToAsync(Stream source, Stream destination, int bufferSize, int emptyReadLimit, CancellationToken cancellationToken);
 
-        Task<int> CopyToAsync(Stream source, Stream destination, CancellationToken cancellationToken);
-
         Task CopyToAsync(Stream source, Stream destination, long copyLength, CancellationToken cancellationToken);
 
         Task CopyUntilCancelled(Stream source, Stream target, int bufferSize, CancellationToken cancellationToken);
diff --git a/MediaBrowser.Model/IO/IZipClient.cs b/MediaBrowser.Model/IO/IZipClient.cs
index 2daa54f22..fca52ebae 100644
--- a/MediaBrowser.Model/IO/IZipClient.cs
+++ b/MediaBrowser.Model/IO/IZipClient.cs
@@ -26,6 +26,7 @@ namespace MediaBrowser.Model.IO
         void ExtractAll(Stream source, string targetPath, bool overwriteExistingFiles);
 
         void ExtractAllFromGz(Stream source, string targetPath, bool overwriteExistingFiles);
+
         void ExtractFirstFileFromGz(Stream source, string targetPath, string defaultFileName);
 
         /// <summary>
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index 2b2377fda..ab74aff28 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -2,7 +2,7 @@
 #pragma warning disable CS1591
 
 using System;
-using MediaBrowser.Model.Entities;
+using Jellyfin.Data.Enums;
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
index b899a464b..dae885775 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
@@ -1,6 +1,6 @@
 #pragma warning disable CS1591
 
-using MediaBrowser.Model.Entities;
+using Jellyfin.Data.Enums;
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 83bd0c07e..c0a75009a 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -8,8 +8,9 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Model</PackageId>
-    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+    <VersionPrefix>10.7.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,13 +20,23 @@
     <TreatWarningsAsErrors Condition=" '$(Configuration)' == 'Release' ">true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Stability)'=='Unstable'">
+    <!-- Include all symbols in the main nupkg until Azure Artifact Feed starts supporting ingesting NuGet symbol packages. -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.7" />
     <PackageReference Include="System.Globalization" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="System.Text.Json" Version="5.0.0-preview.8.20407.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 771ca84f7..afe7351d3 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -125,7 +125,7 @@ namespace MediaBrowser.Model.Net
             { ".wmv", "video/x-ms-wmv" },
 
             // Type audio
-            { ".aac", "audio/mp4" },
+            { ".aac", "audio/aac" },
             { ".ac3", "audio/ac3" },
             { ".ape", "audio/x-ape" },
             { ".dsf", "audio/dsf" },
diff --git a/MediaBrowser.Model/Notifications/NotificationOption.cs b/MediaBrowser.Model/Notifications/NotificationOption.cs
index ea363d9b1..58aecb3d3 100644
--- a/MediaBrowser.Model/Notifications/NotificationOption.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOption.cs
@@ -1,3 +1,4 @@
+#pragma warning disable CA1819 // Properties should not return arrays
 #pragma warning disable CS1591
 
 using System;
@@ -9,21 +10,27 @@ namespace MediaBrowser.Model.Notifications
         public NotificationOption(string type)
         {
             Type = type;
+            DisabledServices = Array.Empty<string>();
+            DisabledMonitorUsers = Array.Empty<string>();
+            SendToUsers = Array.Empty<string>();
+        }
 
+        public NotificationOption()
+        {
             DisabledServices = Array.Empty<string>();
             DisabledMonitorUsers = Array.Empty<string>();
             SendToUsers = Array.Empty<string>();
         }
 
-        public string Type { get; set; }
+        public string? Type { get; set; }
 
         /// <summary>
-        /// User Ids to not monitor (it's opt out).
+        /// Gets or sets user Ids to not monitor (it's opt out).
         /// </summary>
         public string[] DisabledMonitorUsers { get; set; }
 
         /// <summary>
-        /// User Ids to send to (if SendToUserMode == Custom)
+        /// Gets or sets user Ids to send to (if SendToUserMode == Custom).
         /// </summary>
         public string[] SendToUsers { get; set; }
 
diff --git a/MediaBrowser.Model/Plugins/PluginInfo.cs b/MediaBrowser.Model/Plugins/PluginInfo.cs
index c13f1a89f..dd215192f 100644
--- a/MediaBrowser.Model/Plugins/PluginInfo.cs
+++ b/MediaBrowser.Model/Plugins/PluginInfo.cs
@@ -35,6 +35,12 @@ namespace MediaBrowser.Model.Plugins
         /// </summary>
         /// <value>The unique id.</value>
         public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the plugin can be uninstalled.
+        /// </summary>
+        public bool CanUninstall { get; set; }
+
         /// <summary>
         /// Gets or sets the image URL.
         /// </summary>
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index f2e6d8ef3..01784554f 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -1,26 +1,36 @@
-#nullable disable
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Providers
 {
+    /// <summary>
+    /// Represents the external id information for serialization to the client.
+    /// </summary>
     public class ExternalIdInfo
     {
         /// <summary>
-        /// Gets or sets the name.
+        /// Gets or sets the display name of the external id provider (IE: IMDB, MusicBrainz, etc).
+        /// </summary>
+        // TODO: This should be renamed to ProviderName
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the unique key for this id. This key should be unique across all providers.
         /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
+        // TODO: This property is not actually unique across the concrete types at the moment. It should be updated to be unique.
+        public string? Key { get; set; }
 
         /// <summary>
-        /// Gets or sets the key.
+        /// Gets or sets the specific media type for this id. This is used to distinguish between the different
+        /// external id types for providers with multiple ids.
+        /// A null value indicates there is no specific media type associated with the external id, or this is the
+        /// default id for the external provider so there is no need to specify a type.
         /// </summary>
-        /// <value>The key.</value>
-        public string Key { get; set; }
+        /// <remarks>
+        /// This can be used along with the <see cref="Name"/> to localize the external id on the client.
+        /// </remarks>
+        public ExternalIdMediaType? Type { get; set; }
 
         /// <summary>
         /// Gets or sets the URL format string.
         /// </summary>
-        /// <value>The URL format string.</value>
-        public string UrlFormatString { get; set; }
+        public string? UrlFormatString { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Providers/ExternalIdMediaType.cs b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
new file mode 100644
index 000000000..5303c8f58
--- /dev/null
+++ b/MediaBrowser.Model/Providers/ExternalIdMediaType.cs
@@ -0,0 +1,71 @@
+namespace MediaBrowser.Model.Providers
+{
+    /// <summary>
+    /// The specific media type of an <see cref="ExternalIdInfo"/>.
+    /// </summary>
+    /// <remarks>
+    /// Client applications may use this as a translation key.
+    /// </remarks>
+    public enum ExternalIdMediaType
+    {
+        /// <summary>
+        /// A music album.
+        /// </summary>
+        Album = 1,
+
+        /// <summary>
+        /// The artist of a music album.
+        /// </summary>
+        AlbumArtist = 2,
+
+        /// <summary>
+        /// The artist of a media item.
+        /// </summary>
+        Artist = 3,
+
+        /// <summary>
+        /// A boxed set of media.
+        /// </summary>
+        BoxSet = 4,
+
+        /// <summary>
+        /// A series episode.
+        /// </summary>
+        Episode = 5,
+
+        /// <summary>
+        /// A movie.
+        /// </summary>
+        Movie = 6,
+
+        /// <summary>
+        /// An alternative artist apart from the main artist.
+        /// </summary>
+        OtherArtist = 7,
+
+        /// <summary>
+        /// A person.
+        /// </summary>
+        Person = 8,
+
+        /// <summary>
+        /// A release group.
+        /// </summary>
+        ReleaseGroup = 9,
+
+        /// <summary>
+        /// A single season of a series.
+        /// </summary>
+        Season = 10,
+
+        /// <summary>
+        /// A series.
+        /// </summary>
+        Series = 11,
+
+        /// <summary>
+        /// A music track.
+        /// </summary>
+        Track = 12
+    }
+}
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
index 12d537492..2ef6f7c60 100644
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -1,6 +1,7 @@
 #nullable disable
 #pragma warning disable CS1591
 
+using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
@@ -54,7 +55,7 @@ namespace MediaBrowser.Model.Querying
 
         public UpcomingEpisodesQuery()
         {
-            EnableImageTypes = new ImageType[] { };
+            EnableImageTypes = Array.Empty<ImageType>();
         }
     }
 }
diff --git a/MediaBrowser.Model/QuickConnect/QuickConnectResult.cs b/MediaBrowser.Model/QuickConnect/QuickConnectResult.cs
new file mode 100644
index 000000000..0fa40b6a7
--- /dev/null
+++ b/MediaBrowser.Model/QuickConnect/QuickConnectResult.cs
@@ -0,0 +1,40 @@
+using System;
+
+namespace MediaBrowser.Model.QuickConnect
+{
+    /// <summary>
+    /// Stores the result of an incoming quick connect request.
+    /// </summary>
+    public class QuickConnectResult
+    {
+        /// <summary>
+        /// Gets a value indicating whether this request is authorized.
+        /// </summary>
+        public bool Authenticated => !string.IsNullOrEmpty(Authentication);
+
+        /// <summary>
+        /// Gets or sets the secret value used to uniquely identify this request. Can be used to retrieve authentication information.
+        /// </summary>
+        public string? Secret { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user facing code used so the user can quickly differentiate this request from others.
+        /// </summary>
+        public string? Code { get; set; }
+
+        /// <summary>
+        /// Gets or sets the private access token.
+        /// </summary>
+        public string? Authentication { get; set; }
+
+        /// <summary>
+        /// Gets or sets an error message.
+        /// </summary>
+        public string? Error { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DateTime that this request was created.
+        /// </summary>
+        public DateTime? DateAdded { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/QuickConnect/QuickConnectState.cs b/MediaBrowser.Model/QuickConnect/QuickConnectState.cs
new file mode 100644
index 000000000..f1074f25f
--- /dev/null
+++ b/MediaBrowser.Model/QuickConnect/QuickConnectState.cs
@@ -0,0 +1,23 @@
+namespace MediaBrowser.Model.QuickConnect
+{
+    /// <summary>
+    /// Quick connect state.
+    /// </summary>
+    public enum QuickConnectState
+    {
+        /// <summary>
+        /// This feature has not been opted into and is unavailable until the server administrator chooses to opt-in.
+        /// </summary>
+        Unavailable = 0,
+
+        /// <summary>
+        /// The feature is enabled for use on the server but is not currently accepting connection requests.
+        /// </summary>
+        Available = 1,
+
+        /// <summary>
+        /// The feature is actively accepting connection requests.
+        /// </summary>
+        Active = 2
+    }
+}
diff --git a/MediaBrowser.Model/Services/ApiMemberAttribute.cs b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
deleted file mode 100644
index 63f3ecd55..000000000
--- a/MediaBrowser.Model/Services/ApiMemberAttribute.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-#nullable disable
-using System;
-
-namespace MediaBrowser.Model.Services
-{
-    /// <summary>
-    /// Identifies a single API endpoint.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true, Inherited = true)]
-    public class ApiMemberAttribute : Attribute
-    {
-        /// <summary>
-        /// Gets or sets verb to which applies attribute. By default applies to all verbs.
-        /// </summary>
-        public string Verb { get; set; }
-
-        /// <summary>
-        /// Gets or sets parameter type: It can be only one of the following: path, query, body, form, or header.
-        /// </summary>
-        public string ParameterType { get; set; }
-
-        /// <summary>
-        /// Gets or sets unique name for the parameter. Each name must be unique, even if they are associated with different paramType values.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Other notes on the name field:
-        /// If paramType is body, the name is used only for UI and codegeneration.
-        /// If paramType is path, the name field must correspond to the associated path segment from the path field in the api object.
-        /// If paramType is query, the name field corresponds to the query param name.
-        /// </para>
-        /// </remarks>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the human-readable description for the parameter.
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// For path, query, and header paramTypes, this field must be a primitive. For body, this can be a complex or container datatype.
-        /// </summary>
-        public string DataType { get; set; }
-
-        /// <summary>
-        /// For path, this is always true. Otherwise, this field tells the client whether or not the field must be supplied.
-        /// </summary>
-        public bool IsRequired { get; set; }
-
-        /// <summary>
-        /// For query params, this specifies that a comma-separated list of values can be passed to the API. For path and body types, this field cannot be true.
-        /// </summary>
-        public bool AllowMultiple { get; set; }
-
-        /// <summary>
-        /// Gets or sets route to which applies attribute, matches using StartsWith. By default applies to all routes.
-        /// </summary>
-        public string Route { get; set; }
-
-        /// <summary>
-        /// Whether to exclude this property from being included in the ModelSchema.
-        /// </summary>
-        public bool ExcludeInSchema { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
deleted file mode 100644
index afbca78a2..000000000
--- a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma warning disable CS1591
-
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IAsyncStreamWriter
-    {
-        Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken);
-    }
-}
diff --git a/MediaBrowser.Model/Services/IHasHeaders.cs b/MediaBrowser.Model/Services/IHasHeaders.cs
deleted file mode 100644
index 313f34b41..000000000
--- a/MediaBrowser.Model/Services/IHasHeaders.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IHasHeaders
-    {
-        IDictionary<string, string> Headers { get; }
-    }
-}
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
deleted file mode 100644
index b83d3b075..000000000
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma warning disable CS1591
-
-using Microsoft.AspNetCore.Http;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IHasRequestFilter
-    {
-        /// <summary>
-        /// Gets the order in which Request Filters are executed.
-        /// &lt;0 Executed before global request filters.
-        /// &gt;0 Executed after global request filters.
-        /// </summary>
-        int Priority { get; }
-
-        /// <summary>
-        /// The request filter is executed before the service.
-        /// </summary>
-        /// <param name="req">The http request wrapper.</param>
-        /// <param name="res">The http response wrapper.</param>
-        /// <param name="requestDto">The request DTO.</param>
-        void RequestFilter(IRequest req, HttpResponse res, object requestDto);
-    }
-}
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
deleted file mode 100644
index 3ea65195c..000000000
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IHttpRequest : IRequest
-    {
-        /// <summary>
-        /// Gets the HTTP Verb.
-        /// </summary>
-        string HttpMethod { get; }
-
-        /// <summary>
-        /// Gets the value of the Accept HTTP Request Header.
-        /// </summary>
-        string Accept { get; }
-    }
-}
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
deleted file mode 100644
index abc581d8e..000000000
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System.Net;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IHttpResult : IHasHeaders
-    {
-        /// <summary>
-        /// The HTTP Response Status.
-        /// </summary>
-        int Status { get; set; }
-
-        /// <summary>
-        /// The HTTP Response Status Code.
-        /// </summary>
-        HttpStatusCode StatusCode { get; set; }
-
-        /// <summary>
-        /// The HTTP Response ContentType.
-        /// </summary>
-        string ContentType { get; set; }
-
-        /// <summary>
-        /// Response DTO.
-        /// </summary>
-        object Response { get; set; }
-
-        /// <summary>
-        /// Holds the request call context.
-        /// </summary>
-        IRequest RequestContext { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
deleted file mode 100644
index 8bc1d3668..000000000
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.AspNetCore.Http;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IRequest
-    {
-        HttpResponse Response { get; }
-
-        /// <summary>
-        /// The name of the service being called (e.g. Request DTO Name)
-        /// </summary>
-        string OperationName { get; set; }
-
-        /// <summary>
-        /// The Verb / HttpMethod or Action for this request
-        /// </summary>
-        string Verb { get; }
-
-        /// <summary>
-        /// The request ContentType.
-        /// </summary>
-        string ContentType { get; }
-
-        bool IsLocal { get; }
-
-        string UserAgent { get; }
-
-        /// <summary>
-        /// The expected Response ContentType for this request.
-        /// </summary>
-        string ResponseContentType { get; set; }
-
-        /// <summary>
-        /// Attach any data to this request that all filters and services can access.
-        /// </summary>
-        Dictionary<string, object> Items { get; }
-
-        IHeaderDictionary Headers { get; }
-
-        IQueryCollection QueryString { get; }
-
-        string RawUrl { get; }
-
-        string AbsoluteUri { get; }
-
-        /// <summary>
-        /// The Remote Ip as reported by X-Forwarded-For, X-Real-IP or Request.UserHostAddress
-        /// </summary>
-        string RemoteIp { get; }
-
-        /// <summary>
-        /// The value of the Authorization Header used to send the Api Key, null if not available.
-        /// </summary>
-        string Authorization { get; }
-
-        string[] AcceptTypes { get; }
-
-        string PathInfo { get; }
-
-        Stream InputStream { get; }
-
-        long ContentLength { get; }
-
-        /// <summary>
-        /// The value of the Referrer, null if not available.
-        /// </summary>
-        Uri UrlReferrer { get; }
-    }
-
-    public interface IHttpFile
-    {
-        string Name { get; }
-
-        string FileName { get; }
-
-        long ContentLength { get; }
-
-        string ContentType { get; }
-
-        Stream InputStream { get; }
-    }
-
-    public interface IRequiresRequest
-    {
-        IRequest Request { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Services/IRequiresRequestStream.cs b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
deleted file mode 100644
index 3e5f2da42..000000000
--- a/MediaBrowser.Model/Services/IRequiresRequestStream.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma warning disable CS1591
-
-using System.IO;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IRequiresRequestStream
-    {
-        /// <summary>
-        /// The raw Http Request Input Stream.
-        /// </summary>
-        Stream RequestStream { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Services/IService.cs b/MediaBrowser.Model/Services/IService.cs
deleted file mode 100644
index 5233f57ab..000000000
--- a/MediaBrowser.Model/Services/IService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Services
-{
-    // marker interface
-    public interface IService
-    {
-    }
-
-    public interface IReturn { }
-
-    public interface IReturn<T> : IReturn { }
-
-    public interface IReturnVoid : IReturn { }
-}
diff --git a/MediaBrowser.Model/Services/IStreamWriter.cs b/MediaBrowser.Model/Services/IStreamWriter.cs
deleted file mode 100644
index 3ebfef66b..000000000
--- a/MediaBrowser.Model/Services/IStreamWriter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma warning disable CS1591
-
-using System.IO;
-
-namespace MediaBrowser.Model.Services
-{
-    public interface IStreamWriter
-    {
-        void WriteTo(Stream responseStream);
-    }
-}
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
deleted file mode 100644
index bdb0cabdf..000000000
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MediaBrowser.Model.Dto;
-
-namespace MediaBrowser.Model.Services
-{
-    // Remove this garbage class, it's just a bastard copy of NameValueCollection
-    public class QueryParamCollection : List<NameValuePair>
-    {
-        public QueryParamCollection()
-        {
-        }
-
-        private static StringComparison GetStringComparison()
-        {
-            return StringComparison.OrdinalIgnoreCase;
-        }
-
-        /// <summary>
-        /// Adds a new query parameter.
-        /// </summary>
-        public void Add(string key, string value)
-        {
-            Add(new NameValuePair(key, value));
-        }
-
-        private void Set(string key, string value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                var parameters = GetItems(key);
-
-                foreach (var p in parameters)
-                {
-                    Remove(p);
-                }
-
-                return;
-            }
-
-            foreach (var pair in this)
-            {
-                var stringComparison = GetStringComparison();
-
-                if (string.Equals(key, pair.Name, stringComparison))
-                {
-                    pair.Value = value;
-                    return;
-                }
-            }
-
-            Add(key, value);
-        }
-
-        private string Get(string name)
-        {
-            var stringComparison = GetStringComparison();
-
-            foreach (var pair in this)
-            {
-                if (string.Equals(pair.Name, name, stringComparison))
-                {
-                    return pair.Value;
-                }
-            }
-
-            return null;
-        }
-
-        private List<NameValuePair> GetItems(string name)
-        {
-            var stringComparison = GetStringComparison();
-
-            var list = new List<NameValuePair>();
-
-            foreach (var pair in this)
-            {
-                if (string.Equals(pair.Name, name, stringComparison))
-                {
-                    list.Add(pair);
-                }
-            }
-
-            return list;
-        }
-
-        public virtual List<string> GetValues(string name)
-        {
-            var stringComparison = GetStringComparison();
-
-            var list = new List<string>();
-
-            foreach (var pair in this)
-            {
-                if (string.Equals(pair.Name, name, stringComparison))
-                {
-                    list.Add(pair.Value);
-                }
-            }
-
-            return list;
-        }
-
-        public IEnumerable<string> Keys
-        {
-            get
-            {
-                var keys = new string[this.Count];
-
-                for (var i = 0; i < keys.Length; i++)
-                {
-                    keys[i] = this[i].Name;
-                }
-
-                return keys;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a query parameter value by name. A query may contain multiple values of the same name
-        /// (i.e. "x=1&amp;x=2"), in which case the value is an array, which works for both getting and setting.
-        /// </summary>
-        /// <param name="name">The query parameter name.</param>
-        /// <returns>The query parameter value or array of values.</returns>
-        public string this[string name]
-        {
-            get => Get(name);
-            set => Set(name, value);
-        }
-
-        private string GetQueryStringValue(NameValuePair pair)
-        {
-            return pair.Name + "=" + pair.Value;
-        }
-
-        public override string ToString()
-        {
-            var vals = this.Select(GetQueryStringValue).ToArray();
-
-            return string.Join("&", vals);
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Services/RouteAttribute.cs b/MediaBrowser.Model/Services/RouteAttribute.cs
deleted file mode 100644
index f8bf51112..000000000
--- a/MediaBrowser.Model/Services/RouteAttribute.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Model.Services
-{
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
-    public class RouteAttribute : Attribute
-    {
-        /// <summary>
-        ///     <para>Initializes an instance of the <see cref="RouteAttribute"/> class.</para>
-        /// </summary>
-        /// <param name="path">
-        ///     <para>The path template to map to the request.  See
-        ///        <see cref="Path">RouteAttribute.Path</see>
-        ///        for details on the correct format.</para>
-        /// </param>
-        public RouteAttribute(string path)
-            : this(path, null)
-        {
-        }
-
-        /// <summary>
-        ///     <para>Initializes an instance of the <see cref="RouteAttribute"/> class.</para>
-        /// </summary>
-        /// <param name="path">
-        ///     <para>The path template to map to the request.  See
-        ///         <see cref="Path">RouteAttribute.Path</see>
-        ///         for details on the correct format.</para>
-        /// </param>
-        /// <param name="verbs">A comma-delimited list of HTTP verbs supported by the
-        ///     service.  If unspecified, all verbs are assumed to be supported.</param>
-        public RouteAttribute(string path, string verbs)
-        {
-            Path = path;
-            Verbs = verbs;
-        }
-
-        /// <summary>
-        ///     Gets or sets the path template to be mapped to the request.
-        /// </summary>
-        /// <value>
-        ///     A <see cref="String"/> value providing the path mapped to
-        ///     the request.  Never <see langword="null"/>.
-        /// </value>
-        /// <remarks>
-        ///     <para>Some examples of valid paths are:</para>
-        ///
-        ///     <list>
-        ///         <item>"/Inventory"</item>
-        ///         <item>"/Inventory/{Category}/{ItemId}"</item>
-        ///         <item>"/Inventory/{ItemPath*}"</item>
-        ///     </list>
-        ///
-        ///     <para>Variables are specified within "{}"
-        ///     brackets.  Each variable in the path is mapped to the same-named property
-        ///     on the request DTO.  At runtime, ServiceStack will parse the
-        ///     request URL, extract the variable values, instantiate the request DTO,
-        ///     and assign the variable values into the corresponding request properties,
-        ///     prior to passing the request DTO to the service object for processing.</para>
-        ///
-        ///     <para>It is not necessary to specify all request properties as
-        ///     variables in the path.  For unspecified properties, callers may provide
-        ///     values in the query string.  For example: the URL
-        ///     "http://services/Inventory?Category=Books&amp;ItemId=12345" causes the same
-        ///     request DTO to be processed as "http://services/Inventory/Books/12345",
-        ///     provided that the paths "/Inventory" (which supports the first URL) and
-        ///     "/Inventory/{Category}/{ItemId}" (which supports the second URL)
-        ///     are both mapped to the request DTO.</para>
-        ///
-        ///     <para>Please note that while it is possible to specify property values
-        ///     in the query string, it is generally considered to be less RESTful and
-        ///     less desirable than to specify them as variables in the path.  Using the
-        ///     query string to specify property values may also interfere with HTTP
-        ///     caching.</para>
-        ///
-        ///     <para>The final variable in the path may contain a "*" suffix
-        ///     to grab all remaining segments in the path portion of the request URL and assign
-        ///     them to a single property on the request DTO.
-        ///     For example, if the path "/Inventory/{ItemPath*}" is mapped to the request DTO,
-        ///     then the request URL "http://services/Inventory/Books/12345" will result
-        ///     in a request DTO whose ItemPath property contains "Books/12345".
-        ///     You may only specify one such variable in the path, and it must be positioned at
-        ///     the end of the path.</para>
-        /// </remarks>
-        public string Path { get; set; }
-
-        /// <summary>
-        ///    Gets or sets short summary of what the route does.
-        /// </summary>
-        public string Summary { get; set; }
-
-        public string Description { get; set; }
-
-        public bool IsHidden { get; set; }
-
-        /// <summary>
-        ///    Gets or sets longer text to explain the behaviour of the route.
-        /// </summary>
-        public string Notes { get; set; }
-
-        /// <summary>
-        ///     Gets or sets a comma-delimited list of HTTP verbs supported by the service, such as
-        ///     "GET,PUT,POST,DELETE".
-        /// </summary>
-        /// <value>
-        ///     A <see cref="String"/> providing a comma-delimited list of HTTP verbs supported
-        ///     by the service, <see langword="null"/> or empty if all verbs are supported.
-        /// </value>
-        public string Verbs { get; set; }
-
-        /// <summary>
-        /// Used to rank the precedences of route definitions in reverse routing.
-        /// i.e. Priorities below 0 are auto-generated have less precedence.
-        /// </summary>
-        public int Priority { get; set; }
-
-        protected bool Equals(RouteAttribute other)
-        {
-            return base.Equals(other)
-                && string.Equals(Path, other.Path)
-                && string.Equals(Summary, other.Summary)
-                && string.Equals(Notes, other.Notes)
-                && string.Equals(Verbs, other.Verbs)
-                && Priority == other.Priority;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj))
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            return Equals((RouteAttribute)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Path != null ? Path.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (Summary != null ? Summary.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (Notes != null ? Notes.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (Verbs != null ? Verbs.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ Priority;
-                return hashCode;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index d57bed171..6a66465a2 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -2,7 +2,6 @@
 #pragma warning disable CS1591
 
 using System;
-using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Model.Session
 {
@@ -15,21 +14,18 @@ namespace MediaBrowser.Model.Session
         /// Gets or sets the item ids.
         /// </summary>
         /// <value>The item ids.</value>
-        [ApiMember(Name = "ItemIds", Description = "The ids of the items to play, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
         public Guid[] ItemIds { get; set; }
 
         /// <summary>
         /// Gets or sets the start position ticks that the first item should be played at.
         /// </summary>
         /// <value>The start position ticks.</value>
-        [ApiMember(Name = "StartPositionTicks", Description = "The starting position of the first item.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
         public long? StartPositionTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the play command.
         /// </summary>
         /// <value>The play command.</value>
-        [ApiMember(Name = "PlayCommand", Description = "The type of play command to issue (PlayNow, PlayNext, PlayLast). Clients who have not yet implemented play next and play last may play now.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
         public PlayCommand PlayCommand { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs b/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
index d67b6bd55..0c77a6132 100644
--- a/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
+++ b/MediaBrowser.Model/SyncPlay/JoinGroupRequest.cs
@@ -12,11 +12,5 @@ namespace MediaBrowser.Model.SyncPlay
         /// </summary>
         /// <value>The Group id to join.</value>
         public Guid GroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the playing item id.
-        /// </summary>
-        /// <value>The client's currently playing item id.</value>
-        public Guid PlayingItemId { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
index 671f4e01f..e89efeed8 100644
--- a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
+++ b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
@@ -23,16 +23,16 @@ namespace MediaBrowser.Model.SyncPlay
         /// <summary>
         /// A user is signaling that playback is buffering.
         /// </summary>
-        Buffering = 3,
+        Buffer = 3,
 
         /// <summary>
         /// A user is signaling that playback resumed.
         /// </summary>
-        BufferingDone = 4,
+        Ready = 4,
 
         /// <summary>
         /// A user is reporting its ping.
         /// </summary>
-        UpdatePing = 5
+        Ping = 5
     }
 }
diff --git a/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs b/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs
index b08acba2c..2f05e08c5 100644
--- a/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs
+++ b/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs
@@ -1,6 +1,6 @@
 #nullable disable
 using System;
-using MediaBrowser.Model.Events;
+using Jellyfin.Data.Events;
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Tasks/ITaskManager.cs b/MediaBrowser.Model/Tasks/ITaskManager.cs
index 363773ff7..02b29074e 100644
--- a/MediaBrowser.Model/Tasks/ITaskManager.cs
+++ b/MediaBrowser.Model/Tasks/ITaskManager.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Events;
+using Jellyfin.Data.Events;
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Updates/RepositoryInfo.cs b/MediaBrowser.Model/Updates/RepositoryInfo.cs
new file mode 100644
index 000000000..bd42e77f0
--- /dev/null
+++ b/MediaBrowser.Model/Updates/RepositoryInfo.cs
@@ -0,0 +1,20 @@
+namespace MediaBrowser.Model.Updates
+{
+    /// <summary>
+    /// Class RepositoryInfo.
+    /// </summary>
+    public class RepositoryInfo
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the URL.
+        /// </summary>
+        /// <value>The URL.</value>
+        public string? Url { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index caf2e0f54..a1f01f7e8 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -80,11 +80,11 @@ namespace MediaBrowser.Model.Users
 
         public bool EnableAllDevices { get; set; }
 
-        public string[] EnabledChannels { get; set; }
+        public Guid[] EnabledChannels { get; set; }
 
         public bool EnableAllChannels { get; set; }
 
-        public string[] EnabledFolders { get; set; }
+        public Guid[] EnabledFolders { get; set; }
 
         public bool EnableAllFolders { get; set; }
 
@@ -94,9 +94,9 @@ namespace MediaBrowser.Model.Users
 
         public bool EnablePublicSharing { get; set; }
 
-        public string[] BlockedMediaFolders { get; set; }
+        public Guid[] BlockedMediaFolders { get; set; }
 
-        public string[] BlockedChannels { get; set; }
+        public Guid[] BlockedChannels { get; set; }
 
         public int RemoteClientBitrateLimit { get; set; }
 
@@ -145,10 +145,10 @@ namespace MediaBrowser.Model.Users
             LoginAttemptsBeforeLockout = -1;
 
             EnableAllChannels = true;
-            EnabledChannels = Array.Empty<string>();
+            EnabledChannels = Array.Empty<Guid>();
 
             EnableAllFolders = true;
-            EnabledFolders = Array.Empty<string>();
+            EnabledFolders = Array.Empty<Guid>();
 
             EnabledDevices = Array.Empty<string>();
             EnableAllDevices = true;