diff --git a/Directory.Build.props b/Directory.Build.props
index 56ab2370c3..1d8f755b34 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -29,7 +29,7 @@
   <!-- Package Validation -->
   <PropertyGroup>
     <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
-    <EnablePackageValidation>false</EnablePackageValidation>
+    <EnablePackageValidation>true</EnablePackageValidation>
     <PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
diff --git a/global.json b/global.json
index da113e4cbd..36394634bd 100644
--- a/global.json
+++ b/global.json
@@ -4,4 +4,4 @@
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs b/src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs
index 242fd47857..06b6472506 100644
--- a/src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs
+++ b/src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -11,20 +12,20 @@ namespace Umbraco.Cms.Api.Delivery.Handlers;
 
 internal sealed class InitializeMemberApplicationNotificationHandler : INotificationAsyncHandler<UmbracoApplicationStartingNotification>
 {
-    private readonly IMemberApplicationManager _memberApplicationManager;
     private readonly IRuntimeState _runtimeState;
     private readonly ILogger<InitializeMemberApplicationNotificationHandler> _logger;
     private readonly DeliveryApiSettings _deliveryApiSettings;
+    private readonly IServiceScopeFactory _serviceScopeFactory;
 
     public InitializeMemberApplicationNotificationHandler(
-        IMemberApplicationManager memberApplicationManager,
         IRuntimeState runtimeState,
         IOptions<DeliveryApiSettings> deliveryApiSettings,
-        ILogger<InitializeMemberApplicationNotificationHandler> logger)
+        ILogger<InitializeMemberApplicationNotificationHandler> logger,
+        IServiceScopeFactory serviceScopeFactory)
     {
-        _memberApplicationManager = memberApplicationManager;
         _runtimeState = runtimeState;
         _logger = logger;
+        _serviceScopeFactory = serviceScopeFactory;
         _deliveryApiSettings = deliveryApiSettings.Value;
     }
 
@@ -35,26 +36,31 @@ internal sealed class InitializeMemberApplicationNotificationHandler : INotifica
             return;
         }
 
+        // we cannot inject the IMemberApplicationManager because it ultimately takes a dependency on the DbContext ... and during
+        // install that is not allowed (no connection string means no DbContext)
+        using IServiceScope scope = _serviceScopeFactory.CreateScope();
+        IMemberApplicationManager memberApplicationManager = scope.ServiceProvider.GetRequiredService<IMemberApplicationManager>();
+
         if (_deliveryApiSettings.MemberAuthorization?.AuthorizationCodeFlow?.Enabled is not true)
         {
-            await _memberApplicationManager.DeleteMemberApplicationAsync(cancellationToken);
+            await memberApplicationManager.DeleteMemberApplicationAsync(cancellationToken);
             return;
         }
 
         if (ValidateRedirectUrls(_deliveryApiSettings.MemberAuthorization.AuthorizationCodeFlow.LoginRedirectUrls) is false)
         {
-            await _memberApplicationManager.DeleteMemberApplicationAsync(cancellationToken);
+            await memberApplicationManager.DeleteMemberApplicationAsync(cancellationToken);
             return;
         }
 
         if (_deliveryApiSettings.MemberAuthorization.AuthorizationCodeFlow.LogoutRedirectUrls.Any()
             && ValidateRedirectUrls(_deliveryApiSettings.MemberAuthorization.AuthorizationCodeFlow.LogoutRedirectUrls) is false)
         {
-            await _memberApplicationManager.DeleteMemberApplicationAsync(cancellationToken);
+            await memberApplicationManager.DeleteMemberApplicationAsync(cancellationToken);
             return;
         }
 
-        await _memberApplicationManager.EnsureMemberApplicationAsync(
+        await memberApplicationManager.EnsureMemberApplicationAsync(
             _deliveryApiSettings.MemberAuthorization.AuthorizationCodeFlow.LoginRedirectUrls,
             _deliveryApiSettings.MemberAuthorization.AuthorizationCodeFlow.LogoutRedirectUrls,
             cancellationToken);
diff --git a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
index 3d7e01a0ad..7694f83dd2 100644
--- a/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs
@@ -1,14 +1,10 @@
-using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using Serilog;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DistributedLocking;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Persistence.EFCore.Factories;
 using Umbraco.Cms.Persistence.EFCore.Locking;
 using Umbraco.Cms.Persistence.EFCore.Scoping;
 
@@ -22,13 +18,6 @@ public static class UmbracoEFCoreServiceCollectionExtensions
     public static IServiceCollection AddUmbracoEFCoreContext<T>(this IServiceCollection services, DefaultEFCoreOptionsAction? defaultEFCoreOptionsAction = null)
         where T : DbContext
     {
-        var optionsBuilder = new DbContextOptionsBuilder<T>();
-        services.TryAddSingleton<IDbContextFactory<T>>(
-            sp =>
-            {
-                SetupDbContext(defaultEFCoreOptionsAction, sp, optionsBuilder);
-                return new UmbracoPooledDbContextFactory<T>(sp.GetRequiredService<IRuntimeState>(), optionsBuilder.Options);
-            });
         services.AddPooledDbContextFactory<T>((provider, builder) => SetupDbContext(defaultEFCoreOptionsAction, provider, builder));
         services.AddTransient(services => services.GetRequiredService<IDbContextFactory<T>>().CreateDbContext());
 
@@ -52,13 +41,6 @@ public static class UmbracoEFCoreServiceCollectionExtensions
             connectionString = connectionString.Replace(Constants.System.DataDirectoryPlaceholder, dataDirectory);
         }
 
-        var optionsBuilder = new DbContextOptionsBuilder<T>();
-        services.TryAddSingleton<IDbContextFactory<T>>(
-            sp =>
-            {
-                defaultEFCoreOptionsAction?.Invoke(optionsBuilder, providerName, connectionString);
-                return new UmbracoPooledDbContextFactory<T>(sp.GetRequiredService<IRuntimeState>(), optionsBuilder.Options);
-            });
         services.AddPooledDbContextFactory<T>(options => defaultEFCoreOptionsAction?.Invoke(options, providerName, connectionString));
         services.AddTransient(services => services.GetRequiredService<IDbContextFactory<T>>().CreateDbContext());
 
@@ -99,13 +81,6 @@ public static class UmbracoEFCoreServiceCollectionExtensions
     {
         optionsAction ??= (sp, options) => { };
 
-        var optionsBuilder = new DbContextOptionsBuilder<T>();
-
-        services.TryAddSingleton<IDbContextFactory<T>>(sp =>
-        {
-            optionsAction.Invoke(sp, optionsBuilder);
-            return new UmbracoPooledDbContextFactory<T>(sp.GetRequiredService<IRuntimeState>(), optionsBuilder.Options);
-        });
         services.AddPooledDbContextFactory<T>(optionsAction);
         services.AddTransient(services => services.GetRequiredService<IDbContextFactory<T>>().CreateDbContext());
 
diff --git a/src/Umbraco.Cms.Persistence.EFCore/Factories/UmbracoPooledDbContextFactory.cs b/src/Umbraco.Cms.Persistence.EFCore/Factories/UmbracoPooledDbContextFactory.cs
deleted file mode 100644
index de0f7db200..0000000000
--- a/src/Umbraco.Cms.Persistence.EFCore/Factories/UmbracoPooledDbContextFactory.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Persistence.EFCore.Factories;
-
-/// <inheritdoc/>
-internal class UmbracoPooledDbContextFactory<TContext> : PooledDbContextFactory<TContext>
-    where TContext : DbContext
-{
-    private readonly IRuntimeState _runtimeState;
-    private readonly DbContextOptions<TContext> _options;
-
-    /// <inheritdoc/>
-    public UmbracoPooledDbContextFactory(IRuntimeState runtimeState, DbContextOptions<TContext> options, int poolSize = 1024 /*DbContextPool<DbContext>.DefaultPoolSize*/) : base(options, poolSize)
-    {
-        _runtimeState = runtimeState;
-        _options = options;
-    }
-
-    /// <inheritdoc/>
-    public override TContext CreateDbContext()
-    {
-        if (_runtimeState.Level == RuntimeLevel.Run)
-        {
-            return base.CreateDbContext();
-        }
-        else
-        {
-            return (TContext?)Activator.CreateInstance(typeof(TContext), _options) ?? throw new InvalidOperationException("Unable to create DbContext");
-        }
-    }
-
-    /// <inheritdoc/>
-    public override async Task<TContext> CreateDbContextAsync(CancellationToken cancellationToken = default)
-    {
-        if (_runtimeState.Level == RuntimeLevel.Run)
-        {
-            return await base.CreateDbContextAsync(cancellationToken);
-        }
-        else
-        {
-            return (TContext?)Activator.CreateInstance(typeof(TContext), _options) ?? throw new InvalidOperationException("Unable to create DbContext");
-        }
-    }
-}
diff --git a/src/Umbraco.Cms.Persistence.EFCore/UmbracoDbContext.cs b/src/Umbraco.Cms.Persistence.EFCore/UmbracoDbContext.cs
index a27630bd34..3df757ee15 100644
--- a/src/Umbraco.Cms.Persistence.EFCore/UmbracoDbContext.cs
+++ b/src/Umbraco.Cms.Persistence.EFCore/UmbracoDbContext.cs
@@ -1,3 +1,4 @@
+using System.Configuration;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.Extensions.DependencyInjection;
@@ -55,6 +56,10 @@ public class UmbracoDbContext : DbContext
         {
             ILogger<UmbracoDbContext> logger = StaticServiceProvider.Instance.GetRequiredService<ILogger<UmbracoDbContext>>();
             logger.LogCritical("No connection string was found, cannot setup Umbraco EF Core context");
+
+            // we're throwing an exception here to make it abundantly clear that one should never utilize (or have a
+            // dependency on) the DbContext before the connection string has been initialized by the installer.
+            throw new ConfigurationErrorsException("No connection string was found, cannot setup Umbraco EF Core context");
         }
 
         IEnumerable<IMigrationProviderSetup> migrationProviders = StaticServiceProvider.Instance.GetServices<IMigrationProviderSetup>();
diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
index f2b95c3a8d..d2db9b11eb 100644
--- a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
+++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
@@ -23,10 +23,10 @@
   </Target>
 
   <Target Name="BuildBelle">
-    <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Client\" Command="npm ci --no-fund --no-audit --prefer-offline" />
-    <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Client\" Command="npm run build:skip-tests" />
     <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Login\" Command="npm ci --no-fund --no-audit --prefer-offline" />
     <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Login\" Command="npm run build" />
+    <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Client\" Command="npm ci --no-fund --no-audit --prefer-offline" />
+    <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Client\" Command="npm run build:skip-tests" />
   </Target>
 
   <Target Name="CleanBellePreconditions" AfterTargets="Clean" Condition="'$(UmbracoBuild)' == ''">
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
index 29c3e95245..faa84121e6 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
@@ -37,10 +37,6 @@
     <title ng-bind="$root.locationTitle">Umbraco</title>
 
     @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoInitCssBundleName))
-
-    <link rel="stylesheet" href="~/umbraco/login/style.css" asp-append-version="true" />
-    <script type="module" src="~/umbraco/login/external.js" asp-append-version="true"></script>
-    <script type="module" src="~/umbraco/login/index.js" asp-append-version="true"></script>
 </head>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
     <noscript>
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
index eee577b609..07b729e737 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
@@ -49,10 +49,7 @@
 
     @Html.Raw(await RuntimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoNonOptimizedPackageCssBundleName))
     @Html.Raw(await RuntimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoCssBundleName))
-
-    <link rel="stylesheet" href="~/umbraco/login/style.css" asp-append-version="true"/>
-    <script type="module" src="~/umbraco/login/external.js" asp-append-version="true"></script>
-    <script type="module" src="~/umbraco/login/index.js" asp-append-version="true"></script>
+    <link rel="stylesheet" href="~/umbraco/lib/umbraco-ui/uui-css/dist/uui-css.css" asp-append-version="true"/>
     <style>
       body {
         margin: 0;
@@ -112,6 +109,9 @@
     </umb-auth>
 </umb-backoffice-icon-registry>
 
+<script src="~/umbraco/lib/umbraco-ui/uui/dist/uui.min.js" asp-append-version="true"></script>
+<script src="~/umbraco/login/login.iife.js" asp-append-version="true"></script>
+
 @if (isDebug)
 {
     @Html.Raw(ProfilerHtml.Render())
diff --git a/src/Umbraco.Core/Constants-WebhookEvents.cs b/src/Umbraco.Core/Constants-WebhookEvents.cs
index 41b9849f08..28c4a42dd2 100644
--- a/src/Umbraco.Core/Constants-WebhookEvents.cs
+++ b/src/Umbraco.Core/Constants-WebhookEvents.cs
@@ -1,84 +1,96 @@
-namespace Umbraco.Cms.Core;
+namespace Umbraco.Cms.Core;
 
 public static partial class Constants
 {
     public static class WebhookEvents
     {
-        public static class Aliases
+        public static class HeaderNames
         {
+            /// <summary>
+            /// Gets the <c>Umb-Webhook-Event</c> HTTP header name.
+            /// </summary>
+            public const string EventName = "Umb-Webhook-Event";
 
             /// <summary>
-            ///     Webhook event alias for content versions deleted
+            /// Gets the <c>Umb-Webhook-RetryCount</c> HTTP header name.
+            /// </summary>
+            public const string RetryCount = "Umb-Webhook-RetryCount";
+        }
+
+        public static class Aliases
+        {
+            /// <summary>
+            /// Webhook event alias for content versions deleted.
             /// </summary>
             public const string ContentDeletedVersions = "Umbraco.ContentDeletedVersions";
 
             /// <summary>
-            ///     Webhook event alias for content blueprint saved
+            /// Webhook event alias for content blueprint saved.
             /// </summary>
             public const string ContentSavedBlueprint = "Umbraco.ContentSavedBlueprint";
 
             /// <summary>
-            ///     Webhook event alias for content blueprint deleted
+            /// Webhook event alias for content blueprint deleted.
             /// </summary>
             public const string ContentDeletedBlueprint = "Umbraco.ContentDeletedBlueprint";
 
             /// <summary>
-            ///     Webhook event alias for content moved into the recycle bin.
+            /// Webhook event alias for content moved into the recycle bin.
             /// </summary>
             public const string ContentMovedToRecycleBin = "Umbraco.ContentMovedToRecycleBin";
 
             /// <summary>
-            ///     Webhook event alias for content sorted.
+            /// Webhook event alias for content sorted.
             /// </summary>
             public const string ContentSorted = "Umbraco.ContentSorted";
 
             /// <summary>
-            ///     Webhook event alias for content moved.
+            /// Webhook event alias for content moved.
             /// </summary>
             public const string ContentMoved = "Umbraco.ContentMoved";
 
             /// <summary>
-            ///     Webhook event alias for content copied.
+            /// Webhook event alias for content copied.
             /// </summary>
             public const string ContentCopied = "Umbraco.ContentCopied";
 
             /// <summary>
-            ///     Webhook event alias for content emptied recycle bin.
+            /// Webhook event alias for content emptied recycle bin.
             /// </summary>
             public const string ContentEmptiedRecycleBin = "Umbraco.ContentEmptiedRecycleBin";
 
             /// <summary>
-            ///     Webhook event alias for content rolled back.
+            /// Webhook event alias for content rolled back.
             /// </summary>
             public const string ContentRolledBack = "Umbraco.ContentRolledBack";
 
             /// <summary>
-            ///     Webhook event alias for content saved.
+            /// Webhook event alias for content saved.
             /// </summary>
             public const string ContentSaved = "Umbraco.ContentSaved";
 
             /// <summary>
-            ///     Webhook event alias for content publish.
+            /// Webhook event alias for content publish.
             /// </summary>
             public const string ContentPublish = "Umbraco.ContentPublish";
 
             /// <summary>
-            ///     Webhook event alias for content delete.
+            /// Webhook event alias for content delete.
             /// </summary>
             public const string ContentDelete = "Umbraco.ContentDelete";
 
             /// <summary>
-            ///     Webhook event alias for content unpublish.
+            /// Webhook event alias for content unpublish.
             /// </summary>
             public const string ContentUnpublish = "Umbraco.ContentUnpublish";
 
             /// <summary>
-            ///     Webhook event alias for media delete.
+            /// Webhook event alias for media delete.
             /// </summary>
             public const string MediaDelete = "Umbraco.MediaDelete";
 
             /// <summary>
-            ///     Webhook event alias for media save.
+            /// Webhook event alias for media save.
             /// </summary>
             public const string MediaSave = "Umbraco.MediaSave";
         }
@@ -86,22 +98,22 @@ public static partial class Constants
         public static class Types
         {
             /// <summary>
-            ///     Webhook event type for content.
+            /// Webhook event type for content.
             /// </summary>
             public const string Content = "Content";
 
             /// <summary>
-            ///     Webhook event type for content media.
+            /// Webhook event type for content media.
             /// </summary>
             public const string Media = "Media";
 
             /// <summary>
-            ///     Webhook event type for content member.
+            /// Webhook event type for content member.
             /// </summary>
             public const string Member = "Member";
 
             /// <summary>
-            ///     Webhook event type for others, this is the default category if you have not chosen one.
+            /// Webhook event type for others, this is the default category if you have not chosen one.
             /// </summary>
             public const string Other = "Other";
         }
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependency.cs b/src/Umbraco.Core/Deploy/ArtifactDependency.cs
index 80a77740d0..aeb2cfe4a6 100644
--- a/src/Umbraco.Core/Deploy/ArtifactDependency.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactDependency.cs
@@ -34,7 +34,7 @@ public class ArtifactDependency
     /// <value>
     ///   <c>true</c> if the dependency is included when building a dependency tree and gets deployed in the correct order; otherwise, <c>false</c>.
     /// </value>
-    public bool Ordering { get; }
+    public bool Ordering { get; internal set; }
 
     /// <summary>
     /// Gets the dependency mode.
@@ -42,7 +42,7 @@ public class ArtifactDependency
     /// <value>
     /// The dependency mode.
     /// </value>
-    public ArtifactDependencyMode Mode { get; }
+    public ArtifactDependencyMode Mode { get; internal set; }
 
     /// <summary>
     /// Gets or sets the checksum.
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs b/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
index 7f2b05eaad..6446af1ad5 100644
--- a/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
@@ -21,25 +21,39 @@ public class ArtifactDependencyCollection : ICollection<ArtifactDependency>
     /// <inheritdoc />
     public void Add(ArtifactDependency item)
     {
-        if (item.Mode == ArtifactDependencyMode.Exist &&
-            _dependencies.TryGetValue(item.Udi, out ArtifactDependency? existingItem) &&
-            existingItem.Mode == ArtifactDependencyMode.Match)
+        if (_dependencies.TryGetValue(item.Udi, out ArtifactDependency? existingItem))
         {
-            // Don't downgrade dependency mode from Match to Exist
-            return;
-        }
+            // Update existing item
+            if (existingItem.Mode is ArtifactDependencyMode.Exist)
+            {
+                // Allow updating dependency mode from Exist to Match
+                existingItem.Mode = item.Mode;
+            }
 
-        _dependencies[item.Udi] = item;
+            if (existingItem.Ordering is false)
+            {
+                // Allow updating non-ordering to ordering
+                existingItem.Ordering = item.Ordering;
+            }
+
+            if (string.IsNullOrEmpty(item.Checksum) is false)
+            {
+                // Allow updating checksum if set
+                existingItem.Checksum = item.Checksum;
+            }
+        }
+        else
+        {
+            // Add new item
+            _dependencies[item.Udi] = item;
+        }
     }
 
     /// <inheritdoc />
     public void Clear() => _dependencies.Clear();
 
     /// <inheritdoc />
-    public bool Contains(ArtifactDependency item)
-        => _dependencies.TryGetValue(item.Udi, out ArtifactDependency? existingItem) &&
-        // Check whether it has the same or higher dependency mode
-        (existingItem.Mode == item.Mode || existingItem.Mode == ArtifactDependencyMode.Match);
+    public bool Contains(ArtifactDependency item) => _dependencies.ContainsKey(item.Udi);
 
     /// <inheritdoc />
     public void CopyTo(ArtifactDependency[] array, int arrayIndex) => _dependencies.Values.CopyTo(array, arrayIndex);
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
index 3249a25668..4421e7d2f5 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
@@ -1700,7 +1700,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     </key>
     <key alias="copySuccessMessage">Your system information has successfully been copied to the clipboard</key>
     <key alias="cannotCopyInformation">Could not copy your system information to the clipboard</key>
-    <key alias="webhookSaved">Webhook saved</key>    
+    <key alias="webhookSaved">Webhook saved</key>
     <key alias="operationSavedHeaderReloadUser">Saved. To view the changes please reload your browser</key>
     <key alias="editMultiContentPublishedText">%0% documents published and visible on the website</key>
     <key alias="editVariantPublishedText">%0% published and visible on the website</key>
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
index cd7ea4ccb1..d546d0a69d 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
@@ -1051,7 +1051,7 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey
     <key alias="2faMultipleText">Lütfen bir tane 2-aşamalı kimlik doğrulama hizmet sağlayıcı seçin</key>
     <key alias="2faCodeInput">Doğrulama kodu</key>
     <key alias="2faCodeInputHelp">Lütfen doğrulama kodunu girin</key>
-    <key alias="2faInvalidCode">Geçersiz kod girildi</key>    
+    <key alias="2faInvalidCode">Geçersiz kod girildi</key>
   </area>
   <area alias="main">
     <key alias="dashboard">Gösterge Paneli</key>
diff --git a/src/Umbraco.Core/Models/DeliveryApi/ApiLink.cs b/src/Umbraco.Core/Models/DeliveryApi/ApiLink.cs
index d255f6ab32..fcfe12b339 100644
--- a/src/Umbraco.Core/Models/DeliveryApi/ApiLink.cs
+++ b/src/Umbraco.Core/Models/DeliveryApi/ApiLink.cs
@@ -2,19 +2,32 @@ namespace Umbraco.Cms.Core.Models.DeliveryApi;
 
 public sealed class ApiLink
 {
+    [Obsolete("Please use the overload that accepts a query string. Will be removed in V14.")]
     public static ApiLink Content(string title, string? target, Guid destinationId, string destinationType, IApiContentRoute route)
-        => new(LinkType.Content, null, title, target, destinationId, destinationType, route);
+        => Content(title, queryString: null, target, destinationId, destinationType, route);
 
+    public static ApiLink Content(string title, string? queryString, string? target, Guid destinationId, string destinationType, IApiContentRoute route)
+        => new(LinkType.Content, url: null, queryString, title, target, destinationId, destinationType, route);
+
+    [Obsolete("Please use the overload that accepts a query string. Will be removed in V14.")]
     public static ApiLink Media(string title, string url, string? target, Guid destinationId, string destinationType)
-        => new(LinkType.Media, url, title, target, destinationId, destinationType, null);
+        => Media(title, url, queryString: null, target, destinationId, destinationType);
 
+    public static ApiLink Media(string title, string url, string? queryString, string? target, Guid destinationId, string destinationType)
+        => new(LinkType.Media, url, queryString, title, target, destinationId, destinationType, route: null);
+
+    [Obsolete("Please use the overload that accepts a query string. Will be removed in V14.")]
     public static ApiLink External(string? title, string url, string? target)
-        => new(LinkType.External, url, title, target, null, null, null);
+        => External(title, url, queryString: null, target);
 
-    private ApiLink(LinkType linkType, string? url, string? title, string? target, Guid? destinationId, string? destinationType, IApiContentRoute? route)
+    public static ApiLink External(string? title, string url, string? queryString, string? target)
+        => new(LinkType.External, url, queryString, title, target, null, null, null);
+
+    private ApiLink(LinkType linkType, string? url, string? queryString, string? title, string? target, Guid? destinationId, string? destinationType, IApiContentRoute? route)
     {
         LinkType = linkType;
         Url = url;
+        QueryString = queryString;
         Title = title;
         Target = target;
         DestinationId = destinationId;
@@ -24,6 +37,8 @@ public sealed class ApiLink
 
     public string? Url { get; }
 
+    public string? QueryString { get; }
+
     public string? Title { get; }
 
     public string? Target { get; }
diff --git a/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs b/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
index a3dc6ec779..ad4486c698 100644
--- a/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
+++ b/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Cms.Infrastructure.BackgroundJobs.Jobs;
 /// </summary>
 public class HealthCheckNotifierJob : IRecurringBackgroundJob
 {
-    
+
 
     public TimeSpan Period { get; private set; }
     public TimeSpan Delay { get; private set; }
diff --git a/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs b/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs
index bda15fd389..e6d25aff0e 100644
--- a/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs
+++ b/src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs
@@ -1,4 +1,4 @@
-using System.Net.Mime;
+using System.Net.Mime;
 using System.Text;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -101,9 +101,8 @@ public class WebhookFiring : IRecurringBackgroundJob
         try
         {
             // Add headers
-            request.Headers.Add("Umb-Webhook-Event", eventName);
-            request.Headers.Add("Umb-Webhook-RetryCount", retryCount.ToString());
-            request.Headers.Add("Umb-Webhook-Date", DateTime.Now.ToString("R"));
+            request.Headers.Add(Constants.WebhookEvents.HeaderNames.EventName, eventName);
+            request.Headers.Add(Constants.WebhookEvents.HeaderNames.RetryCount, retryCount.ToString());
 
             foreach (KeyValuePair<string, string> header in webhook.Headers)
             {
diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs
index 19aa103123..4cd7df61a0 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs
@@ -57,7 +57,9 @@ public static partial class UmbracoBuilderExtensions
         builder.Services.AddUnique<IDeliveryApiContentIndexFieldDefinitionBuilder, DeliveryApiContentIndexFieldDefinitionBuilder>();
         builder.Services.AddUnique<IDeliveryApiContentIndexHelper, DeliveryApiContentIndexHelper>();
         builder.Services.AddSingleton<IDeliveryApiIndexingHandler, DeliveryApiIndexingHandler>();
-        builder.Services.AddSingleton<ExamineIndexRebuilder>();
+
+        builder.Services.AddSingleton<ExamineIndexRebuilder>();  //TODO remove in Umbraco 15. Only the interface should be in the service provider
+
         builder.Services.AddUnique<IDeliveryApiCompositeIdHandler, DeliveryApiCompositeIdHandler>();
 
         builder.AddNotificationHandler<ContentCacheRefresherNotification, ContentIndexingNotificationHandler>();
diff --git a/src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs b/src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs
index 5394cdc275..5fe98dca0b 100644
--- a/src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs
@@ -10,6 +10,7 @@ using Umbraco.Cms.Infrastructure.HostedServices;
 
 namespace Umbraco.Cms.Infrastructure.Examine;
 
+[Obsolete("This will be removed in Umbraco 15. Use IIndexRebuilder instead.")] // Main reason for this is to remove it form the service container. Maybe even make this internal
 public class ExamineIndexRebuilder : IIndexRebuilder
 {
     private readonly IBackgroundTaskQueue _backgroundTaskQueue;
@@ -66,7 +67,17 @@ public class ExamineIndexRebuilder : IIndexRebuilder
             _logger.LogInformation("Starting async background thread for rebuilding index {indexName}.", indexName);
 
             _backgroundTaskQueue.QueueBackgroundWorkItem(
-                cancellationToken => Task.Run(() => RebuildIndex(indexName, delay.Value, cancellationToken)));
+                cancellationToken =>
+                {
+                    // Do not flow AsyncLocal to the child thread
+                    using (ExecutionContext.SuppressFlow())
+                    {
+                        Task.Run(() => RebuildIndex(indexName, delay.Value, cancellationToken));
+
+                        // immediately return so the queue isn't waiting.
+                        return Task.CompletedTask;
+                    }
+                });
         }
         else
         {
@@ -96,12 +107,16 @@ public class ExamineIndexRebuilder : IIndexRebuilder
             _backgroundTaskQueue.QueueBackgroundWorkItem(
                 cancellationToken =>
                 {
-                    // This is a fire/forget task spawned by the background thread queue (which means we
-                    // don't need to worry about ExecutionContext flowing).
-                    Task.Run(() => RebuildIndexes(onlyEmptyIndexes, delay.Value, cancellationToken));
+                    // Do not flow AsyncLocal to the child thread
+                    using (ExecutionContext.SuppressFlow())
+                    {
+                        // This is a fire/forget task spawned by the background thread queue (which means we
+                        // don't need to worry about ExecutionContext flowing).
+                        Task.Run(() => RebuildIndexes(onlyEmptyIndexes, delay.Value, cancellationToken));
 
-                    // immediately return so the queue isn't waiting.
-                    return Task.CompletedTask;
+                        // immediately return so the queue isn't waiting.
+                        return Task.CompletedTask;
+                    }
                 });
         }
         else
diff --git a/src/Umbraco.Infrastructure/Examine/RebuildOnStartupHandler.cs b/src/Umbraco.Infrastructure/Examine/RebuildOnStartupHandler.cs
index ca7bc49dee..1fb172c452 100644
--- a/src/Umbraco.Infrastructure/Examine/RebuildOnStartupHandler.cs
+++ b/src/Umbraco.Infrastructure/Examine/RebuildOnStartupHandler.cs
@@ -24,17 +24,38 @@ public sealed class RebuildOnStartupHandler : INotificationHandler<UmbracoReques
     private static bool _isReady;
     private static bool _isReadSet;
     private static object? _isReadyLock;
-    private readonly ExamineIndexRebuilder _backgroundIndexRebuilder;
     private readonly IRuntimeState _runtimeState;
     private readonly ISyncBootStateAccessor _syncBootStateAccessor;
+    private readonly IIndexRebuilder _indexRebuilder;
 
+    [Obsolete("Use non-obsolete constructor. This is scheduled for removal in Umbraco 15.")]
     public RebuildOnStartupHandler(
         ISyncBootStateAccessor syncBootStateAccessor,
         ExamineIndexRebuilder backgroundIndexRebuilder,
         IRuntimeState runtimeState)
+        : this(syncBootStateAccessor, (IIndexRebuilder) backgroundIndexRebuilder, runtimeState)
+    {
+
+    }
+
+    [Obsolete("Use non-obsolete constructor. This is scheduled for removal in Umbraco 15.")]
+    public RebuildOnStartupHandler(
+        ISyncBootStateAccessor syncBootStateAccessor,
+        ExamineIndexRebuilder backgroundIndexRebuilder,
+        IIndexRebuilder indexRebuilder,
+        IRuntimeState runtimeState)
+        : this(syncBootStateAccessor, indexRebuilder, runtimeState)
+    {
+
+    }
+
+    public RebuildOnStartupHandler(
+        ISyncBootStateAccessor syncBootStateAccessor,
+        IIndexRebuilder indexRebuilder,
+        IRuntimeState runtimeState)
     {
         _syncBootStateAccessor = syncBootStateAccessor;
-        _backgroundIndexRebuilder = backgroundIndexRebuilder;
+        _indexRebuilder = indexRebuilder;
         _runtimeState = runtimeState;
     }
 
@@ -58,7 +79,7 @@ public sealed class RebuildOnStartupHandler : INotificationHandler<UmbracoReques
                 SyncBootState bootState = _syncBootStateAccessor.GetSyncBootState();
 
                 // if it's not a cold boot, only rebuild empty ones
-                _backgroundIndexRebuilder.RebuildIndexes(
+                _indexRebuilder.RebuildIndexes(
                     bootState != SyncBootState.ColdBoot,
                     TimeSpan.FromMinutes(1));
 
diff --git a/src/Umbraco.Infrastructure/Migrations/PreMigration/DataTypeSplitDataCollector.cs b/src/Umbraco.Infrastructure/Migrations/PreMigration/DataTypeSplitDataCollector.cs
new file mode 100644
index 0000000000..3a133bc253
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/PreMigration/DataTypeSplitDataCollector.cs
@@ -0,0 +1,169 @@
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Composing;
+using Umbraco.Cms.Core.Configuration;
+using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Manifest;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Sync;
+
+namespace Umbraco.Cms.Infrastructure.Migrations.PreMigration;
+
+// we use a composer here so its easier to clean this up when we no longer need it.
+// same for additional classes in the same file, nice and self contained
+// should only be used to migrate from v13 to v14
+// ⚠️ FIXME: PLEASE DELETE THIS IN V14! ⚠️
+public class DataTypeSplitDataCollectorComposer : IComposer
+{
+    public void Compose(IUmbracoBuilder builder)
+    {
+        builder.AddNotificationHandler<UmbracoApplicationStartedNotification, DataTypeSplitDataCollector>();
+    }
+}
+
+public class DataTypeSplitDataCollector : INotificationHandler<UmbracoApplicationStartedNotification>
+{
+    private readonly DataEditorCollection _dataEditors;
+    private readonly IManifestParser _manifestParser;
+    private readonly IDataTypeService _dataTypeService;
+    private readonly IKeyValueService _keyValueService;
+    private readonly IJsonSerializer _jsonSerializer;
+    private readonly ILogger<DataTypeSplitDataCollector> _logger;
+    private readonly ICoreScopeProvider _coreScopeProvider;
+    private readonly IRuntimeState _runtimeState;
+    private readonly IServerRoleAccessor _serverRoleAccessor;
+    private readonly IUmbracoVersion _umbracoVersion;
+
+    public DataTypeSplitDataCollector(
+        DataEditorCollection dataEditors,
+        IManifestParser manifestParser,
+        IDataTypeService dataTypeService,
+        IKeyValueService keyValueService,
+        IJsonSerializer jsonSerializer,
+        ILogger<DataTypeSplitDataCollector> logger,
+        ICoreScopeProvider coreScopeProvider,
+        IRuntimeState runtimeState,
+        IServerRoleAccessor serverRoleAccessor,
+        IUmbracoVersion umbracoVersion)
+    {
+        _dataEditors = dataEditors;
+        _manifestParser = manifestParser;
+        _dataTypeService = dataTypeService;
+        _keyValueService = keyValueService;
+        _jsonSerializer = jsonSerializer;
+        _logger = logger;
+        _coreScopeProvider = coreScopeProvider;
+        _runtimeState = runtimeState;
+        _serverRoleAccessor = serverRoleAccessor;
+        _umbracoVersion = umbracoVersion;
+    }
+
+    public void Handle(UmbracoApplicationStartedNotification notification)
+    {
+        // should only be used to collect data in v13
+        if (_umbracoVersion.Version.Major is not 13)
+        {
+            return;
+        }
+
+        // only run this if the application is actually running and not in an install/upgrade state
+        if (_runtimeState.Level != RuntimeLevel.Run)
+        {
+            return;
+        }
+
+        // do not run on load balanced subscribers
+        if (_serverRoleAccessor.CurrentServerRole == ServerRole.Subscriber)
+        {
+            return;
+        }
+
+        var manifestEditorsData = _manifestParser.CombinedManifest.PropertyEditors
+            .Select(pe => new EditorAliasSplitData(pe.Alias){EditorUiAlias = pe.Alias, EditorAlias = EditorAliasFromValueEditorValueType(pe.GetValueEditor().ValueType)})
+            .ToDictionary(data => data.OriginalEditorAlias);
+
+        _logger.LogDebug("Found {count} custom PropertyEditor(s) configured trough manifest files",manifestEditorsData.Count);
+
+        var fromCodeEditorsData = _dataEditors
+            .Where(de =>
+                de.GetType().Assembly.GetName().FullName
+                    .StartsWith("umbraco.core", StringComparison.InvariantCultureIgnoreCase) is false
+                && de.GetType().Assembly.GetName().FullName
+                    .StartsWith("umbraco.infrastructure", StringComparison.InvariantCultureIgnoreCase) is false)
+            .Select(de => new EditorAliasSplitData(de.Alias) { EditorAlias = de.Alias })
+            .ToDictionary(data => data.OriginalEditorAlias);
+
+        _logger.LogDebug("Found {count} custom PropertyEditor(s) configured trough code",fromCodeEditorsData.Count);
+
+        var combinedEditorsData = new Dictionary<string, EditorAliasSplitData>(manifestEditorsData);
+        foreach (KeyValuePair<string,EditorAliasSplitData> pair in fromCodeEditorsData)
+        {
+            combinedEditorsData.Add(pair.Key,pair.Value);
+        }
+
+        if (combinedEditorsData.Any() == false)
+        {
+            _logger.LogDebug("No custom PropertyEditors found, skipping collection datatype migration data.");
+            return;
+        }
+
+        using ICoreScope coreScope = _coreScopeProvider.CreateCoreScope(autoComplete: true);
+
+        IEnumerable<IDataType> dataTypes = _dataTypeService.GetAll();
+
+        DataTypeEditorAliasMigrationData[] migrationData = dataTypes
+            .Where(dt => combinedEditorsData.ContainsKey(dt.EditorAlias))
+            .Select(dt => new DataTypeEditorAliasMigrationData
+        {
+            DataTypeId = dt.Id,
+            EditorAlias = combinedEditorsData[dt.EditorAlias].EditorAlias,
+            EditorUiAlias = combinedEditorsData[dt.EditorAlias].EditorUiAlias
+        }).ToArray();
+
+        _logger.LogDebug("Collected migration data for {count} DataType(s) that use custom PropertyEditors",migrationData.Length);
+
+        _keyValueService.SetValue("migrateDataEditorSplitCollectionData",_jsonSerializer.Serialize(migrationData));
+    }
+
+    private class EditorAliasSplitData
+    {
+        public EditorAliasSplitData(string originalEditorAlias)
+        {
+            OriginalEditorAlias = originalEditorAlias;
+        }
+
+        public string OriginalEditorAlias { get; init; }
+        public string? EditorUiAlias { get; init; }
+        public string? EditorAlias { get; init; }
+    }
+
+    private class DataTypeEditorAliasMigrationData
+    {
+        public int DataTypeId { get; set; }
+        public string? EditorUiAlias { get; init; }
+        public string? EditorAlias { get; init; }
+    }
+
+    private string EditorAliasFromValueEditorValueType(string valueType)
+    {
+        switch (valueType)
+        {
+            case ValueTypes.Date: return "Umbraco.Plain.DateTime";
+            case ValueTypes.DateTime: return "Umbraco.Plain.DateTime";
+            case ValueTypes.Decimal: return "Umbraco.Plain.Decimal";
+            case ValueTypes.Integer: return "Umbraco.Plain.Integer";
+            case ValueTypes.Bigint: return "Umbraco.Plain.Integer";
+            case ValueTypes.Json: return "Umbraco.Plain.Json";
+            case ValueTypes.Time: return "Umbraco.Plain.Time";
+            case ValueTypes.String: return "Umbraco.Plain.String";
+            case ValueTypes.Xml: return "Umbraco.Plain.String";
+            default:return string.Empty;
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_0_0/ChangeLogStatusCode.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_0_0/ChangeLogStatusCode.cs
index 2df244be8c..3aaf2442aa 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_0_0/ChangeLogStatusCode.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_0_0/ChangeLogStatusCode.cs
@@ -2,7 +2,7 @@
 using NPoco;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Persistence.Dtos;
+using Umbraco.Cms.Infrastructure.Persistence.DatabaseAnnotations;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_13_0_0;
@@ -21,18 +21,18 @@ public class ChangeLogStatusCode : MigrationBase
         }
 
         Sql<ISqlContext> fetchQuery = Database.SqlContext.Sql()
-            .Select<WebhookLogDto>()
-            .From<WebhookLogDto>();
+            .Select<WebhookLogDtoOld>()
+            .From<WebhookLogDtoOld>();
 
         // Use a custom SQL query to prevent selecting explicit columns (sortOrder doesn't exist yet)
-        List<WebhookLogDto> webhookLogDtos = Database.Fetch<WebhookLogDto>(fetchQuery);
+        List<WebhookLogDtoOld> webhookLogDtos = Database.Fetch<WebhookLogDtoOld>(fetchQuery);
 
         Sql<ISqlContext> deleteQuery = Database.SqlContext.Sql()
-            .Delete<WebhookLogDto>();
+            .Delete<WebhookLogDtoOld>();
 
         Database.Execute(deleteQuery);
 
-        foreach (WebhookLogDto webhookLogDto in webhookLogDtos)
+        foreach (WebhookLogDtoOld webhookLogDto in webhookLogDtos)
         {
             if (Enum.TryParse(webhookLogDto.StatusCode, out HttpStatusCode statusCode))
             {
@@ -42,4 +42,62 @@ public class ChangeLogStatusCode : MigrationBase
 
         Database.InsertBatch(webhookLogDtos);
     }
+
+    [TableName(Constants.DatabaseSchema.Tables.WebhookLog)]
+    [PrimaryKey("id")]
+    [ExplicitColumns]
+    private class WebhookLogDtoOld
+    {
+        [Column("id")]
+        [PrimaryKeyColumn(AutoIncrement = true)]
+        public int Id { get; set; }
+
+        [Column("webhookKey")] public Guid WebhookKey { get; set; }
+
+        [Column(Name = "key")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public Guid Key { get; set; }
+
+        [Column(Name = "statusCode")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string StatusCode { get; set; } = string.Empty;
+
+        [Column(Name = "date")]
+        [Index(IndexTypes.NonClustered, Name = "IX_" + Constants.DatabaseSchema.Tables.WebhookLog + "_date")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public DateTime Date { get; set; }
+
+        [Column(Name = "url")]
+        [SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string Url { get; set; } = string.Empty;
+
+        [Column(Name = "eventAlias")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string EventAlias { get; set; } = string.Empty;
+
+        [Column(Name = "retryCount")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public int RetryCount { get; set; }
+
+        [Column(Name = "requestHeaders")]
+        [SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string RequestHeaders { get; set; } = string.Empty;
+
+        [Column(Name = "requestBody")]
+        [SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string RequestBody { get; set; } = string.Empty;
+
+        [Column(Name = "responseHeaders")]
+        [SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string ResponseHeaders { get; set; } = string.Empty;
+
+        [Column(Name = "responseBody")]
+        [SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public string ResponseBody { get; set; } = string.Empty;
+    }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 59aa92bb82..e9d6348e45 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -1223,8 +1223,11 @@ AND umbracoNode.id <> @id",
     ///     If this is not done, then in some cases the "edited" value for a particular culture for a document will remain true
     ///     when it should be false
     ///     if the property was changed to invariant. In order to do this we need to recalculate this value based on the values
-    ///     stored for each
-    ///     property, culture and current/published version.
+    ///     stored for each property, culture and current/published version.
+    ///
+    ///     Some of the sql statements in this function have a tendency to take a lot of parameters (nodeIds)
+    ///     as the WhereIn Npoco method translates all the nodeIds being passed in as parameters when using the SqlClient provider.
+    ///     this results in to many parameters (>2100) error => We need to batch the calls
     /// </remarks>
     private void RenormalizeDocumentEditedFlags(
         IReadOnlyCollection<int> propertyTypeIds,
@@ -1380,16 +1383,19 @@ AND umbracoNode.id <> @id",
         // Now bulk update the table DocumentCultureVariationDto, once for edited = true, another for edited = false
         foreach (IGrouping<bool, DocumentCultureVariationDto> editValue in toUpdate.GroupBy(x => x.Edited))
         {
-            Database.Execute(Sql().Update<DocumentCultureVariationDto>(u => u.Set(x => x.Edited, editValue.Key))
-                .WhereIn<DocumentCultureVariationDto>(x => x.Id, editValue.Select(x => x.Id)));
+            // update in batches to account for maximum parameter count
+            foreach (IEnumerable<DocumentCultureVariationDto> batchedValues in editValue.InGroupsOf(Constants.Sql.MaxParameterCount))
+            {
+                Database.Execute(Sql().Update<DocumentCultureVariationDto>(u => u.Set(x => x.Edited, editValue.Key))
+                    .WhereIn<DocumentCultureVariationDto>(x => x.Id, batchedValues.Select(x => x.Id)));
+            }
         }
 
         // Now bulk update the umbracoDocument table
-        // we need to do this in batches as the WhereIn Npoco method translates to all the nodeIds being passed in as parameters when using the SqlClient provider
-        // this results in to many parameters (>2100) being passed to the client when there are a lot of documents being normalized
         foreach (IGrouping<bool, KeyValuePair<int, bool>> groupByValue in editedDocument.GroupBy(x => x.Value))
         {
-            foreach (IEnumerable<KeyValuePair<int, bool>> batch in groupByValue.InGroupsOf(2000))
+            // update in batches to account for maximum parameter count
+            foreach (IEnumerable<KeyValuePair<int, bool>> batch in groupByValue.InGroupsOf(Constants.Sql.MaxParameterCount))
             {
                 Database.Execute(Sql().Update<DocumentDto>(u => u.Set(x => x.Edited, groupByValue.Key))
                     .WhereIn<DocumentDto>(x => x.NodeId, batch.Select(x => x.Key)));
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
index 61f0fe126d..f4f9d4839b 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
@@ -309,9 +309,15 @@ public class CreatedPackageSchemaRepository : ICreatedPackagesRepository
                 _hostingEnvironment.MapPathContentRoot(Path.Combine(
                     _createdPackagesFolderPath,
                     definition.Name.Replace(' ', '_')));
-            Directory.CreateDirectory(directoryName);
 
-            var finalPackagePath = Path.Combine(directoryName, fileName);
+            var expectedRoot = Path.GetFullPath(_hostingEnvironment.MapPathContentRoot(_createdPackagesFolderPath));
+            var finalPackagePath = Path.GetFullPath(Path.Combine(directoryName, fileName));
+            if (finalPackagePath.StartsWith(expectedRoot) == false)
+            {
+                throw new IOException("Invalid path due to the package name");
+            }
+
+            Directory.CreateDirectory(directoryName);
 
             // Clean existing files
             foreach (var packagePath in new[] { definition.PackagePath, finalPackagePath })
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockEditorPropertyValueConstructorCacheBase.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockEditorPropertyValueConstructorCacheBase.cs
index 3edd1a680e..3af7b4beba 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockEditorPropertyValueConstructorCacheBase.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockEditorPropertyValueConstructorCacheBase.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using Umbraco.Cms.Core.Models.Blocks;
 using Umbraco.Cms.Core.Models.PublishedContent;
 
@@ -8,7 +9,7 @@ public abstract class BlockEditorPropertyValueConstructorCacheBase<T>
     where T : IBlockReference<IPublishedElement, IPublishedElement>
 {
     private readonly
-        Dictionary<(Guid, Guid?), Func<Udi, IPublishedElement, Udi?, IPublishedElement?, T>>
+        ConcurrentDictionary<(Guid, Guid?), Func<Udi, IPublishedElement, Udi?, IPublishedElement?, T>>
         _constructorCache = new();
 
     public bool TryGetValue((Guid ContentTypeKey, Guid? SettingsTypeKey) key, [MaybeNullWhen(false)] out Func<Udi, IPublishedElement, Udi?, IPublishedElement?, T> value)
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
index dfc64bdad5..61cc0e1c7d 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
@@ -185,6 +185,7 @@ public class MultiUrlPickerValueConverter : PropertyValueConverterBase, IDeliver
                         ? null
                         : ApiLink.Content(
                             item.Name.IfNullOrWhiteSpace(_apiContentNameProvider.GetName(content)),
+                            item.QueryString,
                             item.Target,
                             content.Key,
                             content.ContentType.Alias,
@@ -195,12 +196,13 @@ public class MultiUrlPickerValueConverter : PropertyValueConverterBase, IDeliver
                         ? null
                         : ApiLink.Media(
                             item.Name.IfNullOrWhiteSpace(_apiContentNameProvider.GetName(media)),
-                            _apiMediaUrlProvider.GetUrl(media),
+                            $"{_apiMediaUrlProvider.GetUrl(media)}{item.QueryString}",
+                            item.QueryString,
                             item.Target,
                             media.Key,
                             media.ContentType.Alias);
                 default:
-                    return ApiLink.External(item.Name, $"{item.Url}{item.QueryString}", item.Target);
+                    return ApiLink.External(item.Name, $"{item.Url}{item.QueryString}", item.QueryString, item.Target);
             }
         }
 
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
index 56f740804e..ab25dc691c 100644
--- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
@@ -59,6 +59,8 @@ public class BackOfficeWebAssets
             BundlingOptions.NotOptimizedAndComposite,
             FormatPaths(
                 "assets/css/umbraco.min.css",
+                "lib/umbraco-ui/uui-css/dist/custom-properties.css",
+                "lib/umbraco-ui/uui-css/dist/uui-text.css",
                 "lib/bootstrap-social/bootstrap-social.css",
                 "lib/font-awesome/css/font-awesome.min.css"));
 
diff --git a/src/Umbraco.Infrastructure/WebAssets/JsInitialize.js b/src/Umbraco.Infrastructure/WebAssets/JsInitialize.js
index 14dab707c1..28ec6ad24f 100644
--- a/src/Umbraco.Infrastructure/WebAssets/JsInitialize.js
+++ b/src/Umbraco.Infrastructure/WebAssets/JsInitialize.js
@@ -35,6 +35,10 @@
     'lib/umbraco/NamespaceManager.js',
     'lib/umbraco/LegacySpeechBubble.js',
 
+    'lib/umbraco-ui/uui/dist/uui.min.js',
+
+    'login/login.iife.js',
+
     'js/utilities.min.js',
 
     'js/app.min.js',
diff --git a/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs b/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs
index 1820f2b5e0..b9980308b9 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs
@@ -1,9 +1,12 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers;
 
+[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
 public class AnalyticsController : UmbracoAuthorizedJsonController
 {
     private readonly IMetricsConsentService _metricsConsentService;
diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
index 71eb240fd5..45a1746b7e 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
@@ -470,6 +470,9 @@ public class AuthenticationController : UmbracoApiControllerBase
         }
 
         BackOfficeIdentityUser? identityUser = await _userManager.FindByEmailAsync(model.Email);
+
+        await Task.Delay(RandomNumberGenerator.GetInt32(400, 2500)); // To randomize response time preventing user enumeration
+
         if (identityUser != null)
         {
             IUser? user = _userService.GetByEmail(model.Email);
@@ -490,14 +493,20 @@ public class AuthenticationController : UmbracoApiControllerBase
 
                 var mailMessage = new EmailMessage(from, user.Email, subject, message, true);
 
-                await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.PasswordReset, true);
+                try
+                {
+                    await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.PasswordReset, true);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error sending email, please check your SMTP configuration: {ErrorMessage}", ex.Message);
+                    return Ok();
+                }
 
                 _userManager.NotifyForgotPasswordRequested(User, user.Id.ToString());
             }
         }
 
-        await Task.Delay(RandomNumberGenerator.GetInt32(400, 2500));
-
         return Ok();
     }
 
@@ -592,7 +601,7 @@ public class AuthenticationController : UmbracoApiControllerBase
             await _signInManager.TwoFactorSignInAsync(model.Provider, model.Code, model.IsPersistent, model.RememberClient);
         if (result.Succeeded)
         {
-            return GetUserDetail(_userService.GetByUsername(user.UserName));
+            return Ok(GetUserDetail(_userService.GetByUsername(user.UserName)));
         }
 
         if (result.IsLockedOut)
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
index d06062498a..6ba81172c8 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
@@ -826,6 +826,7 @@ public class ContentController : ContentControllerBase
     /// <param name="contentId">The content id to copy</param>
     /// <param name="name">The name of the blueprint</param>
     /// <returns></returns>
+    [Authorize(Policy = AuthorizationPolicies.ContentPermissionCreateBlueprintFromId)]
     [HttpPost]
     public ActionResult<SimpleNotificationModel> CreateBlueprintFromContent(
         [FromQuery] int contentId,
@@ -881,8 +882,9 @@ public class ContentController : ContentControllerBase
     /// <summary>
     ///     Saves content
     /// </summary>
+    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
     [FileUploadCleanupFilter]
-    [ContentSaveValidation]
+    [ContentSaveValidation(skipUserAccessValidation:true)] // skip user access validation because we "only" require Settings access to create new blueprints from scratch
     public async Task<ActionResult<ContentItemDisplay<ContentVariantDisplay>?>?> PostSaveBlueprint(
         [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
     {
@@ -2077,6 +2079,7 @@ public class ContentController : ContentControllerBase
         return Ok();
     }
 
+    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
     [HttpDelete]
     [HttpPost]
     public IActionResult DeleteBlueprint(int id)
diff --git a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
index 4cb7dc52fc..3e54bb705a 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
@@ -35,7 +35,7 @@ public class LanguageController : UmbracoAuthorizedJsonController
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public IDictionary<string, string> GetAllCultures()
+        [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]public IDictionary<string, string> GetAllCultures()
             => CultureInfo.GetCultures(CultureTypes.AllCultures).DistinctBy(x => x.Name).OrderBy(x => x.EnglishName).ToDictionary(x => x.Name, x => x.EnglishName);
 
     /// <summary>
@@ -51,6 +51,7 @@ public class LanguageController : UmbracoAuthorizedJsonController
     }
 
     [HttpGet]
+    [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]
     public ActionResult<Language?> GetLanguage(int id)
     {
         ILanguage? lang = _localizationService.GetLanguageById(id);
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs
index c8c391d990..91cd16a0f6 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs
@@ -1,13 +1,16 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Web.Common.Attributes;
+using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers;
 
 [PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
+[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
 public class PublishedSnapshotCacheStatusController : UmbracoAuthorizedApiController
 {
     private readonly DistributedCache _distributedCache;
diff --git a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
index 11e8099a57..9e6f977d72 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers;
 
 [Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
 [PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
+[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
 public class RedirectUrlManagementController : UmbracoAuthorizedApiController
 {
     private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
@@ -48,6 +49,8 @@ public class RedirectUrlManagementController : UmbracoAuthorizedApiController
         _configManipulator = configManipulator ?? throw new ArgumentNullException(nameof(configManipulator));
     }
 
+    private bool IsEnabled => _webRoutingSettings.CurrentValue.DisableRedirectUrlTracking == false;
+
     /// <summary>
     ///     Returns true/false of whether redirect tracking is enabled or not
     /// </summary>
@@ -55,9 +58,8 @@ public class RedirectUrlManagementController : UmbracoAuthorizedApiController
     [HttpGet]
     public IActionResult GetEnableState()
     {
-        var enabled = _webRoutingSettings.CurrentValue.DisableRedirectUrlTracking == false;
         var userIsAdmin = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false;
-        return Ok(new { enabled, userIsAdmin });
+        return Ok(new { enabled = IsEnabled, userIsAdmin });
     }
 
     //add paging
@@ -107,6 +109,11 @@ public class RedirectUrlManagementController : UmbracoAuthorizedApiController
     [HttpPost]
     public IActionResult DeleteRedirectUrl(Guid id)
     {
+        if (IsEnabled is false)
+        {
+            return BadRequest("Redirect URL tracking is disabled, and therefore no URLs can be deleted.");
+        }
+
         _redirectUrlService.Delete(id);
         return Ok();
     }
diff --git a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs
index 32adfcfdf6..1fc5f641f6 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs
@@ -1,8 +1,10 @@
+using Microsoft.AspNetCore.Authorization;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.Common.Attributes;
+using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
 using Stylesheet = Umbraco.Cms.Core.Models.ContentEditing.Stylesheet;
 
@@ -12,6 +14,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers;
 ///     The API controller used for retrieving available stylesheets
 /// </summary>
 [PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
+[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
 public class StylesheetController : UmbracoAuthorizedJsonController
 {
     private readonly IFileService _fileService;
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs
index bfd460bda4..0945d3459b 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs
+++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs
@@ -179,6 +179,13 @@ public static partial class UmbracoBuilderExtensions
             policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionDelete.ActionLetter));
         });
 
+        options.AddPolicy(AuthorizationPolicies.ContentPermissionCreateBlueprintFromId, policy =>
+        {
+            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
+            policy.Requirements.Add(
+                new ContentPermissionsQueryStringRequirement(ActionCreateBlueprintFromContent.ActionLetter, "contentId"));
+        });
+
         options.AddPolicy(AuthorizationPolicies.BackOfficeAccess, policy =>
         {
             policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
index 100d089451..f7be9d129a 100644
--- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
+++ b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
@@ -20,9 +20,12 @@ namespace Umbraco.Cms.Web.BackOffice.Filters;
 /// </summary>
 internal sealed class ContentSaveValidationAttribute : TypeFilterAttribute
 {
-    public ContentSaveValidationAttribute() : base(typeof(ContentSaveValidationFilter)) =>
+    public ContentSaveValidationAttribute(bool skipUserAccessValidation = false)
+        : base(typeof(ContentSaveValidationFilter))
+    {
         Order = -3000; // More important than ModelStateInvalidFilter.FilterOrder
-
+        Arguments = new object[] { skipUserAccessValidation };
+    }
 
     private sealed class ContentSaveValidationFilter : IAsyncActionFilter
     {
@@ -32,6 +35,7 @@ internal sealed class ContentSaveValidationAttribute : TypeFilterAttribute
         private readonly ILocalizationService _localizationService;
         private readonly ILoggerFactory _loggerFactory;
         private readonly IPropertyValidationService _propertyValidationService;
+        private readonly bool _skipUserAccessValidation;
 
 
         public ContentSaveValidationFilter(
@@ -40,7 +44,8 @@ internal sealed class ContentSaveValidationAttribute : TypeFilterAttribute
             IPropertyValidationService propertyValidationService,
             IAuthorizationService authorizationService,
             IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            ILocalizationService localizationService)
+            ILocalizationService localizationService,
+            bool skipUserAccessValidation)
         {
             _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
             _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
@@ -49,6 +54,7 @@ internal sealed class ContentSaveValidationAttribute : TypeFilterAttribute
             _authorizationService = authorizationService;
             _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
             _localizationService = localizationService;
+            _skipUserAccessValidation = skipUserAccessValidation;
         }
 
         public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
@@ -88,7 +94,7 @@ internal sealed class ContentSaveValidationAttribute : TypeFilterAttribute
                 return;
             }
 
-            if (!await ValidateUserAccessAsync(model, context))
+            if (_skipUserAccessValidation is false && await ValidateUserAccessAsync(model, context) is false)
             {
                 return;
             }
diff --git a/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs b/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs
index cfad020a92..429cc77faf 100644
--- a/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs
+++ b/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs
@@ -22,6 +22,7 @@ public static class AuthorizationPolicies
     public const string ContentPermissionProtectById = nameof(ContentPermissionProtectById);
     public const string ContentPermissionBrowseById = nameof(ContentPermissionBrowseById);
     public const string ContentPermissionDeleteById = nameof(ContentPermissionDeleteById);
+    public const string ContentPermissionCreateBlueprintFromId = nameof(ContentPermissionCreateBlueprintFromId);
 
     public const string MediaPermissionByResource = nameof(MediaPermissionByResource);
     public const string MediaPermissionPathById = nameof(MediaPermissionPathById);
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
index 65fd7199d1..41693fa9b4 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
@@ -282,6 +282,22 @@ function dependencies() {
             ],
             "base": "./node_modules/wicg-inert"
         },
+        {
+          "name": "umbraco-ui",
+          "src": [
+            "./node_modules/@umbraco-ui/uui/dist/uui.min.js",
+            "./node_modules/@umbraco-ui/uui/dist/uui.min.js.map",
+            "./node_modules/@umbraco-ui/uui-css/dist/custom-properties.css",
+            "./node_modules/@umbraco-ui/uui-css/dist/uui-text.css",
+            "./node_modules/@umbraco-ui/uui-css/dist/uui-css.css",
+            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Black.woff2",
+            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Light.woff2",
+            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Regular.woff2",
+            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Italic.woff2",
+            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Bold.woff2"
+          ],
+          "base": "./node_modules/@umbraco-ui"
+        },
     ];
 
     // add streams for node modules
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
index e09718176c..7b0a10cf31 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
@@ -28,7 +28,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
      *    });
      * </pre>
      * @returns {Promise} resourcePromise object
-     * 
+     *
      */
     get2FAProviders: function () {
 
@@ -203,7 +203,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
             "PostRequestPasswordReset"), {
             email: email
           }),
-        'Request password reset failed for email ' + email);
+        'An email with password reset instructions will be sent to the specified address if it matched our records');
     },
 
     /**
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index eea4c66647..f582be59ef 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -398,9 +398,9 @@ When building a custom infinite editor view you can use the same components as a
      * @returns {object} editor object
      */
     function contentTypePicker(editor) {
-      
+
       if (!editor.entityType) editor.entityType = "documentType";
-      
+
       switch (editor.entityType) {
         case "documentType":
           documentTypePicker(editor);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html b/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html
index be11a78d76..5d8b9cd3fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html
@@ -1,6 +1,6 @@
-<div ng-controller="Umbraco.Login2faController as vm" class="umb-login-container">
+<div ng-controller="Umbraco.Login2faController as cvm" class="umb-login-container">
   <div id="twoFactorlogin" ng-cloak="">
-    <form name="vm.authForm" method="POST" ng-submit="vm.validate()">
+    <form name="cvm.authForm" method="POST" ng-submit="cvm.validate()">
       <header class="h4">
         <localize key="login_2fatitle">One last step</localize>
       </header>
@@ -12,19 +12,19 @@
       <br>
 
       <!-- if there's only one provider active, it will skip this step! -->
-      <umb-control-group ng-if="vm.providers.length > 1" label="@login_2faMultipleText" label-for="provider" alias="2faprovider">
-        <select id="2faprovider" name="provider" ng-model="vm.provider">
-          <option ng-repeat="provider in vm.providers" ng-value="provider">{{provider}}</option>
+      <umb-control-group ng-if="cvm.providers.length > 1" label="@login_2faMultipleText" label-for="provider" alias="2faprovider">
+        <select id="2faprovider" name="provider" ng-model="cvm.provider">
+          <option ng-repeat="provider in cvm.providers" ng-value="provider">{{provider}}</option>
         </select>
       </umb-control-group>
 
       <umb-control-group label-for="token" alias="2facode" label="@login_2faCodeInput" description="@user_2faDisableText" required="true">
 
         <input type="text" id="2facode" class="-full-width-input input-xlarge" name="token"
-          inputmode="numeric" autocomplete="one-time-code" ng-model="vm.code" localize="placeholder"
+          inputmode="numeric" autocomplete="one-time-code" ng-model="cvm.code" localize="placeholder"
           placeholder="@login_2faCodeInputHelp" aria-required="true" required umb-auto-focus no-dirty-check />
 
-        <div ng-messages="vm.authForm.token.$error" role="alert">
+        <div ng-messages="cvm.authForm.token.$error" role="alert">
           <span class="umb-validation-label" ng-message="token">
             <localize key="login_2faInvalidCode">Invalid code entered</localize>
           </span>
@@ -37,14 +37,14 @@
           button-style="success"
           size="m"
           label-key="general_validate"
-          state="vm.stateValidateButton"
-          disabled="vm.code.length === 0">
+          state="cvm.stateValidateButton"
+          disabled="cvm.code.length === 0">
         </umb-button>
         <umb-button
           type="button"
           size="m"
           label-key="general_back"
-          action="vm.goBack()">
+          action="cvm.goBack()">
         </umb-button>
       </div>
     </form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
index 13ca4cb193..ec039dfdd7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
@@ -11,11 +11,12 @@ angular.module('umbraco').controller("Umbraco.LoginController", function (events
       //check if there's a returnPath query string, if so redirect to it
         var locationObj = $location.search();
         if (locationObj.returnPath) {
-            // decodeURIComponent(...) does not play nice with OAuth redirect URLs, so until we have a
-            // dedicated login screen for the new back-office, we need to hardcode this exception
-            path = locationObj.returnPath.indexOf("/security/back-office/authorize") > 0
-              ? locationObj.returnPath
-              : decodeURIComponent(locationObj.returnPath);
+            // ensure that the returnPath is a valid URL under the current origin (prevents DOM-XSS among other things)
+            const returnPath = decodeURIComponent(locationObj.returnPath);
+            const url = new URL(returnPath, window.location.origin);
+            if (url.origin === window.location.origin) {
+                path = returnPath;
+            }
         }
 
         // Ensure path is not absolute
diff --git a/src/Umbraco.Web.UI.Login/index.html b/src/Umbraco.Web.UI.Login/index.html
index 7c01c2345c..3a656f45d9 100644
--- a/src/Umbraco.Web.UI.Login/index.html
+++ b/src/Umbraco.Web.UI.Login/index.html
@@ -9,6 +9,7 @@
   <meta name="robots" content="noindex, nofollow"/>
   <meta name="pinterest" content="nopin"/>
   <title>Umbraco</title>
+  <link rel="stylesheet" href="/node_modules/@umbraco-ui/uui-css/dist/uui-css.css"/>
   <script type="module">
     import {startMockServiceWorker} from './src/mocks/index.ts';
 
@@ -16,7 +17,6 @@
       await startMockServiceWorker();
     }
   </script>
-  <script type="module" src="/src/external.ts"></script>
   <script type="module" src="/src/index.ts"></script>
 </head>
 <body class="uui-font uui-text" style="margin: 0; padding: 0; overflow: hidden">
diff --git a/src/Umbraco.Web.UI.Login/package-lock.json b/src/Umbraco.Web.UI.Login/package-lock.json
index 33fb905898..ab4dc63af0 100644
--- a/src/Umbraco.Web.UI.Login/package-lock.json
+++ b/src/Umbraco.Web.UI.Login/package-lock.json
@@ -6,13 +6,13 @@
 		"": {
 			"name": "login",
 			"dependencies": {
-				"@umbraco-ui/uui": "^1.5.0",
-				"@umbraco-ui/uui-css": "^1.5.0",
 				"lit": "^2.8.0",
 				"msw": "^1.3.2",
 				"rxjs": "^7.8.1"
 			},
 			"devDependencies": {
+				"@umbraco-ui/uui": "1.5.0",
+				"@umbraco-ui/uui-css": "1.5.0",
 				"typescript": "^5.2.2",
 				"vite": "^4.5.1"
 			},
@@ -474,6 +474,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.5.0.tgz",
 			"integrity": "sha512-V9pAdCsiaBy+Vq23sZd9JJCk+TX6xMsclJtTUWhwCq8/YUh6KNERbdoVfMYGUZ1yyJ/g+yddQsWlYOxHNp8msw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-action-bar": "1.5.0",
 				"@umbraco-ui/uui-avatar": "1.5.0",
@@ -562,6 +563,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.5.0.tgz",
 			"integrity": "sha512-2B4ONNRTEtoKjnBo8mtvQo2Y9WW7LDSx6q85UuA+YEWfMOgZ0hr0lFepPg+qq/q90/8ZIoItoxRo16UFrPVaHQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-button-group": "1.5.0"
@@ -571,6 +573,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.5.0.tgz",
 			"integrity": "sha512-Iw4MQ2IMfJq590ydA6d2WXJ3gC7wO1vpA6tZj3T772B81LBZR31ftoMn3ho4cpavV5Nv4LvBnGhc2YajbsVn5A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -579,6 +582,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.5.0.tgz",
 			"integrity": "sha512-hlmqOGLQIN8uJMoLgT+RPHFWIxi8Ridhp/MrKgEjuNF6sTu4bCQyN28XuC9JD+4vBcSjU4a893QGvckalQxZiA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-avatar": "1.5.0",
 				"@umbraco-ui/uui-base": "1.5.0"
@@ -588,6 +592,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.5.0.tgz",
 			"integrity": "sha512-6azqqcqRzVHXYz/JfAody6kDZQG3hiBTiCS8EEYY9GcFNqh8BvFLX4yK9R6zz5BVrjgT3qkmPpE2iIpqV6J58A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -596,6 +601,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.5.0.tgz",
 			"integrity": "sha512-HzKRvbf/aPA1y8l9ZLTvF5Up7W6jX8UwqVUr1B8lwckI6tgxOEFPqLya+U4papqZDh4wz/lysXSDESeVfUy8cw==",
+			"dev": true,
 			"dependencies": {
 				"lit": "^2.3.1"
 			}
@@ -604,6 +610,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.5.0.tgz",
 			"integrity": "sha512-uhIPzi7n3Z4Li3n688Q8v3725apwasZvPntm7kMdtssXay6hUHOcor+hkpPavGXRVxZGg+9gIYRM6sQWp853cA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -612,6 +619,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.5.0.tgz",
 			"integrity": "sha512-uTHBvwzS9pRu0MVfN74+bux6lK0m1AmY/7xor9ez9/uzDyIK096D9jSLTQkfDyngIhqnV6kFLbG7PqcfQURFJQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-css": "1.4.0"
@@ -621,6 +629,7 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
 			"integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
+			"dev": true,
 			"dependencies": {
 				"lit": "^2.2.2"
 			}
@@ -629,6 +638,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.5.0.tgz",
 			"integrity": "sha512-mXuzt5o4NZ1E/HVTLYq+TklX9VQSH5zce+Ef1t2EgUE3EFQH0fwcdCRBC9SpklueNj46ngGHmVhyfv8ekne1Wg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -637,6 +647,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.5.0.tgz",
 			"integrity": "sha512-ujicvfqUAN0JtBcgj8OG1YcyDaArTBdP5LvNsyYB8s0dePgcws71XzJ1mbHbXhuA386ioNue04yGDL+gSFlJ/A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-icon-registry-essential": "1.5.0"
@@ -646,6 +657,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.5.0.tgz",
 			"integrity": "sha512-8yhFdfg7p1B8MM2fIxIlc0Mmhnx46scdGhqeRhvaQ2/dcdpVTI1j1hI2JyOM18TUhJeot4olLqwatlXxlFFT+A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -654,6 +666,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.5.0.tgz",
 			"integrity": "sha512-J60vRf7nzQyRYKj+qYhMQR6LrQH6PyTrxyqyfDOVGzcWKzsTuRahxuVOIOzrs489cznwRYwL11jtK32MlrSjGQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -662,6 +675,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.5.0.tgz",
 			"integrity": "sha512-RgpnQca3rpjMG/3DAmmrExI7gmNNHBNYwfjRqgCd/3QkBwRrtT/+jdppVsGRxxW5xAN90sJ/eLP7i3F5EfWlSA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -670,6 +684,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.5.0.tgz",
 			"integrity": "sha512-aYGeTsppWT0KS9orrqkl9DF2v5l3gSGhBJZqIPiHVBOzczYIcgLWJbdAkaCgpwh1Zacbv3tnB/76965fd4EwPw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-card": "1.5.0",
@@ -680,6 +695,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.5.0.tgz",
 			"integrity": "sha512-0KktT0IExh06W7QP1FMNqU+tpUL1qDwWeeA19PbZPXwHg15hbSW15a+Hc4aiwqlHYHOPT2gxXoiVc7jqWlMcSQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-card": "1.5.0",
@@ -691,6 +707,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.5.0.tgz",
 			"integrity": "sha512-xJjfkRHkt2xim1o+IvEPQiTpIQR+Z9+69096ssuGb3EkxyyUsDmH3aZZH6/+LKdtKR+7mPZVJub9TTWB4VRnwQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-avatar": "1.5.0",
 				"@umbraco-ui/uui-base": "1.5.0",
@@ -701,6 +718,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.5.0.tgz",
 			"integrity": "sha512-4Apw4TMALEydo5o31gsIyICuPVyKvG/oySNup+5psU3apS0JDQ1RXCgGVDFoFxt5xzM+iJ6/J8ZOOILMVNFM6Q==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -709,6 +727,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.5.0.tgz",
 			"integrity": "sha512-Kve+XAIkSFG9kowbZI1MpDEKihpMTtD9q36pcHiVENqxL1+Tydy60yjy3tHV8o6uamJ8qjR6ZlvLttRwLId9tQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-boolean-input": "1.5.0",
@@ -719,6 +738,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.5.0.tgz",
 			"integrity": "sha512-FF6PrUCBo2nOg5iLbD+iB8aa3Vh+skIfqjFsPD80qLE0sKQ/53juZCnCbvvp7Z0YmIqwBlWP7xGEzJBGfS6OlA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"colord": "^2.9.3"
@@ -728,6 +748,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.5.0.tgz",
 			"integrity": "sha512-y/IwXhtaQJWNjwnZtYTvv47+bsmUYJzFLtXqxGckcUmyJQvoZ6DDxslTSv1B9J3QTXU0zpakqpxPszlNNHUygw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"colord": "^2.9.3"
@@ -737,6 +758,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.5.0.tgz",
 			"integrity": "sha512-nkUpUxfD7VlayBHirM56xKqi1h0Opg7Q2suzxEC4KLDVLO1+L0KzsDORn1tfeantSG0PahBMbuve1XOoOwCrAA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -745,6 +767,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.5.0.tgz",
 			"integrity": "sha512-UDqlGmJIMGyn7C23q33v8dkJoISmIAL0XZNTiPkEhwGjKRlxkbexmGd4L4vFt+nhJDRrN86JoZ64BRTHVN8V7A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-icon-registry-essential": "1.5.0",
@@ -755,6 +778,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.5.0.tgz",
 			"integrity": "sha512-SvTKINbckKvqkkS4XnQfpELkW2x47CUa4PsnXqioXNIWP5sBJb9Kydiu0N1+lV57fAkteqNp+YY8mFxn3a6iPA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-color-swatch": "1.5.0"
@@ -764,6 +788,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.5.0.tgz",
 			"integrity": "sha512-SoK4+yR0dJViXZinZ7iqowl6tvWPTTPSOBVE7FfOqOAgFoccOE/nQqjeNjSM0co80OKXqHUsh+kX/HwLjdyNEA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-button": "1.5.0",
@@ -776,6 +801,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.5.0.tgz",
 			"integrity": "sha512-5cVlhnst3p6eEHFqn6O8LMswx3wdwpzlfAghleQJW+ZUIVo7ZPXznZz7+6yvnVWxnI7+xxFebHgC0KFxGMUVvg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -784,6 +810,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.5.0.tgz",
 			"integrity": "sha512-jBSJg8KTWDG7DOVzz7A+UpMxMNHtddcLgt9k25vC4H+84xl+TN51RFTqF8C0JCZdWFK0eKWYlJsGqVrDfoVCcg==",
+			"dev": true,
 			"dependencies": {
 				"lit": "^2.2.2"
 			}
@@ -792,6 +819,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.5.0.tgz",
 			"integrity": "sha512-m6J5i+eiLdNApryIY1KW/4kyunAuTpkcWBjQmxyESmlDIqRGdW0lqaahQvcZSZHto03jleUdH5wYTLNgKIb/rw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-css": "1.4.0"
@@ -801,6 +829,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.5.0.tgz",
 			"integrity": "sha512-vfZ3FMzYccGBVvSSXvCeoHYX+VU8QppXtFR2OGDZwU0b8BOKtfKTP/2VLPEWCG4vJYKPmqZESo3N9bZXWDkWSg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -809,6 +838,7 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
 			"integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
+			"dev": true,
 			"dependencies": {
 				"lit": "^2.2.2"
 			}
@@ -817,6 +847,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.5.0.tgz",
 			"integrity": "sha512-3rkTWidY4k2fyktRxfsMVTSvF+EIguv9p1Fga7v4DCNkplCp6OyJnwWby5F//+NvTHphaGchxZirOWMLgLyDog==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-symbol-file-dropzone": "1.5.0"
@@ -826,6 +857,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.5.0.tgz",
 			"integrity": "sha512-Re+R8uZSD3t3jUgZvzG/DfQtihss7aw+rG41IAjmRO9wBZuUAsowfgCd2OJnuOYJXeaqOYYl+QQr7pmR2a/HNQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-symbol-file": "1.5.0",
@@ -837,6 +869,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.5.0.tgz",
 			"integrity": "sha512-rbXFZzAg93/fzvNkxHavUr62DnSeWuVghd9CK9lhe6A9ER9cfjOcGn/INTYK3HHPBalay9IOq+WV1xxC5H6zyg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -845,6 +878,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.5.0.tgz",
 			"integrity": "sha512-owla3DWo1deVUEG0JzC7pE70h6Ll6lmbR+B+utbMdEgM6shEMdokpPioeCaXb8v7On9Whz+zJGAGBAYl/oyjug==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-form-validation-message": "1.5.0"
@@ -854,6 +888,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.5.0.tgz",
 			"integrity": "sha512-wuWCzttkUlEctqdJi9qzSzT8h10WvoK3+5usYB9V8NpdPYzOmbXU5RDYpoTWS0nPO56C6rlRlt3TH1khIQtPJA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -862,6 +897,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.5.0.tgz",
 			"integrity": "sha512-8Sz6PaYTC8KDCKj5ed+xnlnuh9/NOs0tQGPOma1bnVxGJN8LNjl+cJSLp+iU1m3Qq50H0TG+0K/dS3WUExjbZw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -870,6 +906,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.5.0.tgz",
 			"integrity": "sha512-ei+HnaCKFjcCYjHYC0hqncY2vDfbgRkWhftOnrhqVZPJkE4omWDmVsLSGg/vm88ar1QleDmVj+CAa4J9T+uVeg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-icon": "1.5.0"
@@ -879,6 +916,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.5.0.tgz",
 			"integrity": "sha512-nxNEQDI4SNBXnI2/Ov60vcdzKFyRCInwZDFNAKyt31F1yTNM0EM0ne5yV4AqM6YPOKVoWzqFcLz2rx64X+oLvQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-icon-registry": "1.5.0"
@@ -888,6 +926,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.5.0.tgz",
 			"integrity": "sha512-TlbSIRh2Z7xJxW0GEPENd369W1hHgr9Y8IIRE5RDllXzZc8yho4QXPJSDFQTiHMf41LIkOTfIkrQst5047FiXg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -896,6 +935,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.5.0.tgz",
 			"integrity": "sha512-8h/qGED5KE7sb/YE7dHapZxcWXGm0qCPJft8AGOu/ZK/WdOUV1WHynLjV4yGVZgY9PVZGc+GQTzvdgwxxpltQw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-action-bar": "1.5.0",
 				"@umbraco-ui/uui-base": "1.5.0",
@@ -909,6 +949,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.5.0.tgz",
 			"integrity": "sha512-KBhZLLD+5qyibbcp0AiJo7V4e/+GiKouGz/rCk6/3vxEKpe8CtWekcHhjrdlsHcOluQeBcb1Pdqng0wC9UTO5Q==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-button": "1.5.0",
@@ -920,6 +961,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.5.0.tgz",
 			"integrity": "sha512-8wvQ/10jfufU0QWhK3gBVo5V/fzk4AuX8wPuieKZDY9Jnwkr7ugZ11DOJtaV3Az/4a0nrfF3TQ2gbBC7zHx2JA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-icon-registry-essential": "1.5.0",
@@ -930,6 +972,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.5.0.tgz",
 			"integrity": "sha512-KVTMHl6X0T4cUA3bUgM06xzwCN3VD5W3tZloF0i6e3PTHhkyCE5tKD/2Hizm56OGb+ifaI/oN3L1m7vEPC8IHw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -938,6 +981,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.5.0.tgz",
 			"integrity": "sha512-Sc6XuMEyivBEQDfMOA6JT7nW5H4/eD6dzUtUNabOwzCG5GUpvTMfRccpdjmzOvl9VCGNWtE9ikqCBZWexWA6YA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -946,6 +990,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.5.0.tgz",
 			"integrity": "sha512-lhl1KqRbM5NTp08fvxgzOsbHFz04z8/WjaOar6lqNnL0R+CcFtVWQrv69Opht9Sj1NdHESmHEVnX0yodod2LhQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -954,6 +999,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.5.0.tgz",
 			"integrity": "sha512-qUcVXi4i+ClozPc0Vfw7g90CLAQVj04F71xtatxDY5nhSWDEMEI6b/pXtN/B9TklkqfgE1mf/gRziFrpbVjLhA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -962,6 +1008,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.5.0.tgz",
 			"integrity": "sha512-059/DJDYbgOmr/LPXbiDaTkBcInmzUUu/YDtQt/SkZPCO33uuB7TDc+++cMgFYskdXBpqesNvVfZOUd4P6zJyA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -970,6 +1017,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.5.0.tgz",
 			"integrity": "sha512-rmKuTz0Xgf0LyQRqs3tr2Z4O6oaNCd7UmI8kEbluk4yKpk5MU38BlFY9p39fpiEVUuzjcg9pBjrEyxrC/H9xjA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-loader-bar": "1.5.0",
@@ -980,6 +1028,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.5.0.tgz",
 			"integrity": "sha512-q9g4rA8OYCPlOmZMES/O17NiAu18wtMxNHMuT6dADP2tuULE+TKT6A8vqC7aq8JkWOTAXRAFvTjTmcvm6L2pvg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -988,6 +1037,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.5.0.tgz",
 			"integrity": "sha512-I3gCWbyLRFvi5fAlezQZarvj7FuEZ7NVZbbKJxqEhbo1bwOxDMXlDNxIIrxSg3R8YAuDNP9Pbdw+rnQwupuOMQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-button": "1.5.0",
@@ -998,6 +1048,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.5.0.tgz",
 			"integrity": "sha512-Ab8UL4UGxTUn6hYbTqPrMtyGpQr3Xw1E/PVKG3+j+UrNw1Ro5piKgh0TahwxLnrsXWOPXfy53oaXNYsMGenndA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1006,6 +1057,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.5.0.tgz",
 			"integrity": "sha512-issjf86TwvwLA6sJOs5pLRMFY+WBc4oeTZiJMz5mhZ5C5UoRmU65L6RP/0UnzZ4ZGY2Gpdh2YatNnZ7hVMg5ig==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1014,6 +1066,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.5.0.tgz",
 			"integrity": "sha512-B/v7VsBBwo19Y+4NBRllt7Ls+WLQfx6vY57rfO8MQG7zxGznxpTSIYvd3wxdRuDsFQeVwwoYjF1/YBJ7iWUnEQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1022,6 +1075,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.5.0.tgz",
 			"integrity": "sha512-3e52VZHcgHB/17eLTmiZwdm7ENgfX6AF4Dw+8H2x8jdRjyvt8lbykCq+6xewAZFsLAu7vTOEKtd2RhQFI2+hwg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1030,6 +1084,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.5.0.tgz",
 			"integrity": "sha512-oHmIoF+KrHDWiOKonIWq7n94C6CzStBXrleS6iwCgWY++ayaHKCPlCuQIYp3BmGjnMQn8Ou0r2x/RuBPuraLVQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1038,6 +1093,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.5.0.tgz",
 			"integrity": "sha512-wba/OP6b/mG5kp4bUgBBcBAAy3RWTbokVyjb52FR7nyqNMnIE/UBdgi0XeBx4j6lZeEbr5k5ZOGQ1knEHbPWyQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1046,6 +1102,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.5.0.tgz",
 			"integrity": "sha512-sxs3hC97zDuFaV8mvXLAbqqtWk0kqDdHY9ORt9CxacdT36nQS58Sw60/plCryqoyp7P2cUZVtlEeff53OKOTCQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1054,6 +1111,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.5.0.tgz",
 			"integrity": "sha512-bjmMgrIW+/4bmUXwMwFFaPrg2MeTxXssb6EpbBItJ+s0QhTEcTNyAD/DK3RlSMRE5VPO11sRwgCr06aIhklx0Q==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-icon": "1.5.0",
@@ -1064,6 +1122,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.5.0.tgz",
 			"integrity": "sha512-k14MI3cRELOmAwmtFeBzgCFw4+uin0JSqf85ZaqNkXSAmg+4I0ayUI6PGz+Jw66yGHvw3YNeUMKPmLO8l6M79A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-ref-node": "1.5.0"
@@ -1073,6 +1132,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.5.0.tgz",
 			"integrity": "sha512-ouytDUaSls7Hsd0WaDy4wgfKMLpxlxx16WWyHlzX5lMyhkR+S3olyNZcgDRtz9xIQV+dVE3iDsUeQcNAigCdaw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-ref-node": "1.5.0"
@@ -1082,6 +1142,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.5.0.tgz",
 			"integrity": "sha512-D86A1+ScVGTer2kci6Y9X4ZAhCnm4kxUi7bCFH7dn7oi/Fq8fhs3PBuA7mr1FrZgrPvXVdW+Qa7ldxxU58NIWA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-ref-node": "1.5.0"
@@ -1091,6 +1152,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.5.0.tgz",
 			"integrity": "sha512-/UPmUNk6KP2unKnJKjr1qGkdPlFGTRj3K7H/mczCY7IbtzEccdEswWJCdUy/doIkAKbDdaqKe3/9HBoA3JtWPw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-ref-node": "1.5.0"
@@ -1100,6 +1162,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.5.0.tgz",
 			"integrity": "sha512-XkET8XKb3XxmjlIDrmtwm9o0QsaG81bcpUBEBA/wUC0OcJNrjTKyv6ciAVDP7HaW6XpN8XwsRbqdcrYwM8lXDQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-ref-node": "1.5.0"
@@ -1109,6 +1172,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.5.0.tgz",
 			"integrity": "sha512-9TrIr1JWw3cIkWfQrdv9iLRIqm/dd10d6uZEWaGJ/MuxyCywqMg/LSApV/NLapB4HXhIG4pGCiXvUa8OVW99ew==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-ref-node": "1.5.0"
@@ -1118,6 +1182,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.5.0.tgz",
 			"integrity": "sha512-Xj5jnmCEDyRENmWtuPI1QYEMzrmi/9/LaajkPEIZEYVu2owI940F0viS5X+X/FvKehSxoSt9ainCwkLphgzNiw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1126,6 +1191,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.5.0.tgz",
 			"integrity": "sha512-lcMiIM6WxF5YraIXAqSpujx3OJzq6Snfik0BUypTWbUZdKVQTgLPh3A6We9PdD6K64AX2Zk4eH8yhQ+5GNImzQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1134,6 +1200,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.5.0.tgz",
 			"integrity": "sha512-Mp6xz7C7GbAuQ1Totd2WLzvS56ekx4l31mAvUvor0GqrUF/hHxwfrGZOAWoBqoTdKQAFKbZVSM782a+cwNv3hg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1142,6 +1209,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.5.0.tgz",
 			"integrity": "sha512-ZCuGAJT2qFs4wQ6Z+g/qV3obv/SbriMnaIOGy6XTTAuMlh2+aNAwm33Je0wYKCTwHNUmnl427wTMEkQcMziD4g==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1150,6 +1218,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.5.0.tgz",
 			"integrity": "sha512-ClB/lT/ebyUBmPqExB2ZinMOo/bCMEgjGxjkXy2THX4lOLUqvjDNEKLq99MAREKSh/mmGq7iB3Z/hd9/EDu75Q==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1158,6 +1227,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.5.0.tgz",
 			"integrity": "sha512-0YL88rFFI5SOzzORtm1VtMihN4if7r0CIRe5Q3Sv0WwHjrMfIM08DeONCgN2j+ZoKgnTvt9KpE1OGigshouRug==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1166,6 +1236,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.5.0.tgz",
 			"integrity": "sha512-/qkf6AdAIsRmUfsBdtFkFk5wPWw6JvSVHvgk/UvZulHHb2F8TamPSJfb6voh86Vq8DzVIcy3ZbqatxH7LZBY1g==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1174,6 +1245,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.5.0.tgz",
 			"integrity": "sha512-Sxt4n5IBT+XIqu2nJxP4RnhourwC+1X5bD40YgUBmqZJ9KV//tox4zo2elU19WCeRZFkklZGfn2smLY1FD0OGg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1182,6 +1254,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.5.0.tgz",
 			"integrity": "sha512-EH7tEPCB+PTyjWbW+bdekk4M5hcjvYYpCKTnl3Pdpzh0mrxHPt9xa8908JB0tG8n0m0EcP+L7k8pthUmkgpK7A==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1190,6 +1263,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.5.0.tgz",
 			"integrity": "sha512-EuhU4kle4swMFZnsguWPz77rOtrk0IQcXuEA60fjzFGJCwsg7yyu9Ns209IEUsYh5ktstj8pXKT8+ZDila5umg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1198,6 +1272,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.5.0.tgz",
 			"integrity": "sha512-/cifoZXuZbDmuZFPD0rr95Gpuy18DnboOYb/Ir6G3PANJ0fWOhzykHUrdx18ItLzhhwfE3dcZk4EWcGrEkfnfg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1206,6 +1281,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.5.0.tgz",
 			"integrity": "sha512-tjhpEzBYCQdgieoXcIgcOjROrScF0Ifutz/6gmpcdrXYbgZ+YkWX7dSLAeQj3fzGebaPbNYzGOmGZA9/opZ1rg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1214,6 +1290,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.5.0.tgz",
 			"integrity": "sha512-0D5NLufis9Tzc5Vr+fl8Z0wABHyz1Tep76Qnx0nXyYzAZvdNq2IxThHbGqA1cb+FjVJSKdfp6ONfiPc/SIVAzA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-button": "1.5.0",
@@ -1225,6 +1302,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.5.0.tgz",
 			"integrity": "sha512-OZGitHjdn4coj1x7F7zfeIx5M9NhGd8+CqpD915V9Qm8YlTQxFLq1M8tqjIxaYAB5EcHXuyzRpSUCrt/WUvipA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1233,6 +1311,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.5.0.tgz",
 			"integrity": "sha512-+zDqbYKYfaiG0IXEaQatUaWsD4umtkTtbCMnqVPMhxwneVoE9d69ejat2zLFUI/ERm3nKMyq/NRfxzXJgzlDng==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1241,6 +1320,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.5.0.tgz",
 			"integrity": "sha512-cFjz4/uZudR3yuSqK5gqzAio55ZOOxQAOc8bC5keS0HXL84JcDwrEP4/Nz7X/uUNUqauYZG/iBUirAvqfv7Osw==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-button": "1.5.0",
@@ -1253,6 +1333,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.5.0.tgz",
 			"integrity": "sha512-AB4kwgocUeDwkxiCYNH0AOMEtExDS6sEq9sk2i8AGDAEjprAB3m0HM9AlrA+T0V1GtSuv+Q1DEuCyxnVbuK0WQ==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-toast-notification": "1.5.0"
@@ -1262,6 +1343,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.5.0.tgz",
 			"integrity": "sha512-rM7cGCdMolhsndfZT9zGAPI9P3bl1lNpjDhWI124Mgx+KS8t2Q2h9O+7FGqFnjCTJOQES1pdQ+enl2NxCuEkNg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-css": "1.4.0"
@@ -1271,6 +1353,7 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
 			"integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
+			"dev": true,
 			"dependencies": {
 				"lit": "^2.2.2"
 			}
@@ -1279,6 +1362,7 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
 			"integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
+			"dev": true,
 			"dependencies": {
 				"lit": "^2.2.2"
 			}
@@ -1287,6 +1371,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.5.0.tgz",
 			"integrity": "sha512-vsJSpBSmlrLzspCa1dGQGYXfc6RwTGTzSlNQdnzzP7qefVRP4GlOaqYV0TJhHMcYdbai+iEkrLznzJQvM9JFLA==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0",
 				"@umbraco-ui/uui-boolean-input": "1.5.0"
@@ -1296,6 +1381,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.5.0.tgz",
 			"integrity": "sha512-3Imqxp8+hvirakPogqzvRlU+uhshpGRdrEMU7phCS5VGzDEl8NL1BhxR31EQAw7DspwbD5non3ZwbTwLYydfCg==",
+			"dev": true,
 			"dependencies": {
 				"@umbraco-ui/uui-base": "1.5.0"
 			}
@@ -1583,7 +1669,8 @@
 		"node_modules/colord": {
 			"version": "2.9.3",
 			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
+			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+			"dev": true
 		},
 		"node_modules/cookie": {
 			"version": "0.4.2",
diff --git a/src/Umbraco.Web.UI.Login/package.json b/src/Umbraco.Web.UI.Login/package.json
index b3295d6827..c89dcc38a2 100644
--- a/src/Umbraco.Web.UI.Login/package.json
+++ b/src/Umbraco.Web.UI.Login/package.json
@@ -1,7 +1,6 @@
 {
 	"name": "login",
 	"private": true,
-	"type": "module",
 	"scripts": {
 		"dev": "vite",
 		"build": "tsc && vite build",
@@ -13,13 +12,13 @@
       "npm": ">=10.1"
     },
 	"dependencies": {
-		"@umbraco-ui/uui": "^1.5.0",
-		"@umbraco-ui/uui-css": "^1.5.0",
 		"lit": "^2.8.0",
 		"msw": "^1.3.2",
 		"rxjs": "^7.8.1"
 	},
 	"devDependencies": {
+    "@umbraco-ui/uui": "1.5.0",
+    "@umbraco-ui/uui-css": "1.5.0",
 		"typescript": "^5.2.2",
 		"vite": "^4.5.1"
 	},
diff --git a/src/Umbraco.Web.UI.Login/src/external.ts b/src/Umbraco.Web.UI.Login/src/external.ts
deleted file mode 100644
index f0f791b5e3..0000000000
--- a/src/Umbraco.Web.UI.Login/src/external.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * These are the public exports for the login UI.
- * They are used by the Umbraco backoffice mainly to show external login providers.
- */
-import '@umbraco-ui/uui-css/dist/uui-css.css';
-import '@umbraco-ui/uui';
-import './external/icon.registry.js';
-import './external/custom-view.element.js';
-import './external/localization/localize.element.js';
diff --git a/src/Umbraco.Web.UI.Login/src/index.ts b/src/Umbraco.Web.UI.Login/src/index.ts
index 610175a415..7e95f9a442 100644
--- a/src/Umbraco.Web.UI.Login/src/index.ts
+++ b/src/Umbraco.Web.UI.Login/src/index.ts
@@ -15,5 +15,8 @@ import './components/external-login-provider.element.js';
 import './components/layouts/new-password-layout.element.js';
 import './components/layouts/confirmation-layout.element.js';
 import './components/layouts/error-layout.element.js';
-
 import './components/login-input.element.js';
+
+import './external/icon.registry.js';
+import './external/custom-view.element.js';
+import './external/localization/localize.element.js';
diff --git a/src/Umbraco.Web.UI.Login/vite.config.ts b/src/Umbraco.Web.UI.Login/vite.config.ts
index fb64dfcefa..f1bcb79643 100644
--- a/src/Umbraco.Web.UI.Login/vite.config.ts
+++ b/src/Umbraco.Web.UI.Login/vite.config.ts
@@ -4,14 +4,16 @@ import { defineConfig } from 'vite';
 export default defineConfig({
 	build: {
 		lib: {
-			entry: ['src/index.ts', 'src/external.ts'],
-			formats: ['es'],
+			entry: 'src/index.ts',
+      formats: ['iife'],
+      name: 'umblogin',
+      fileName: 'login'
 		},
     rollupOptions: {
+      external: [/^@umbraco/],
       output: {
-        manualChunks: {
-          'uui': ['@umbraco-ui/uui'],
-          'vendor': ['lit', 'rxjs'],
+        globals: {
+          '@umbraco-ui/uui': 'uui',
         },
       }
     },
diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj
index 0ccbab5e19..cc8fbe7770 100644
--- a/templates/Umbraco.Templates.csproj
+++ b/templates/Umbraco.Templates.csproj
@@ -41,6 +41,7 @@
     </Content>
   </ItemGroup>
 
+
   <!-- Update template.json files with the default UmbracoVersion value set to the current build version -->
   <ItemGroup>
     <PackageReference Include="Umbraco.JsonSchema.Extensions" PrivateAssets="all" />
diff --git a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
index 0336b05f22..dac260b985 100644
--- a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -46,7 +46,7 @@ public static class UmbracoBuilderExtensions
         builder.Services.AddUnique(Mock.Of<IUmbracoBootPermissionChecker>());
         builder.Services.AddUnique(testHelper.MainDom);
 
-        builder.Services.AddUnique<ExamineIndexRebuilder, TestBackgroundIndexRebuilder>();
+        builder.Services.AddUnique<IIndexRebuilder, TestBackgroundIndexRebuilder>();
         builder.Services.AddUnique(factory => Mock.Of<IRuntimeMinifier>());
 
         // we don't want persisted nucache files in tests
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
index 21a06c3643..0ca0b2f579 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
@@ -58,21 +58,64 @@ public class IndexInitializer
         _contentTypeService = contentTypeService;
     }
 
+    [Obsolete("Use ctor that is not obsolete. This will be removed in Umbraco 15.")]
     public IndexInitializer(
         IShortStringHelper shortStringHelper,
         PropertyEditorCollection propertyEditors,
         MediaUrlGeneratorCollection mediaUrlGenerators,
         IScopeProvider scopeProvider,
         ILoggerFactory loggerFactory,
-        IOptions<ContentSettings> contentSettings, IContentTypeService contentTypeService)
+        IOptions<ContentSettings> contentSettings,
+        ILocalizationService localizationService)
         : this(
-        shortStringHelper,
-        propertyEditors,
-        mediaUrlGenerators,
-        scopeProvider,
-        loggerFactory,
-        contentSettings,
-        StaticServiceProvider.Instance.GetRequiredService<ILocalizationService>(), contentTypeService)
+            shortStringHelper,
+            propertyEditors,
+            mediaUrlGenerators,
+            scopeProvider,
+            loggerFactory,
+            contentSettings,
+            localizationService, StaticServiceProvider.Instance.GetRequiredService<IContentTypeService>())
+    {
+
+    }
+
+    [Obsolete("Use ctor that is not obsolete. This will be removed in Umbraco 15.")]
+    public IndexInitializer(
+        IShortStringHelper shortStringHelper,
+        PropertyEditorCollection propertyEditors,
+        MediaUrlGeneratorCollection mediaUrlGenerators,
+        IScopeProvider scopeProvider,
+        ILoggerFactory loggerFactory,
+        IOptions<ContentSettings> contentSettings,
+        IContentTypeService contentTypeService)
+        : this(
+            shortStringHelper,
+            propertyEditors,
+            mediaUrlGenerators,
+            scopeProvider,
+            loggerFactory,
+            contentSettings,
+            StaticServiceProvider.Instance.GetRequiredService<ILocalizationService>(), contentTypeService)
+    {
+    }
+
+    [Obsolete("Use ctor that is not obsolete. This will be removed in Umbraco 15.")]
+    public IndexInitializer(
+        IShortStringHelper shortStringHelper,
+        PropertyEditorCollection propertyEditors,
+        MediaUrlGeneratorCollection mediaUrlGenerators,
+        IScopeProvider scopeProvider,
+        ILoggerFactory loggerFactory,
+        IOptions<ContentSettings> contentSettings)
+        : this(
+            shortStringHelper,
+            propertyEditors,
+            mediaUrlGenerators,
+            scopeProvider,
+            loggerFactory,
+            contentSettings,
+            StaticServiceProvider.Instance.GetRequiredService<ILocalizationService>(),
+            StaticServiceProvider.Instance.GetRequiredService<IContentTypeService>())
     {
     }
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/MultiUrlPickerValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/MultiUrlPickerValueConverterTests.cs
index 818f55861d..a3bd140ce6 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/MultiUrlPickerValueConverterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/MultiUrlPickerValueConverterTests.cs
@@ -157,11 +157,45 @@ public class MultiUrlPickerValueConverterTests : PropertyValueConverterTests
         var link = result.First();
         Assert.AreEqual("The link", link.Title);
         Assert.AreEqual("https://umbraco.com/?something=true", link.Url);
+        Assert.AreEqual("?something=true", link.QueryString);
         Assert.AreEqual(LinkType.External, link.LinkType);
         Assert.AreEqual("_blank", link.Target);
         Assert.Null(link.Route);
     }
 
+    [Test]
+    public void MultiUrlPickerValueConverter_AppliesExplicitConfigurationToMediaLink()
+    {
+        var publishedDataType = new PublishedDataType(123, "test", new Lazy<object>(() => new MultiUrlPickerConfiguration { MaxNumber = 1 }));
+        var publishedPropertyType = new Mock<IPublishedPropertyType>();
+        publishedPropertyType.SetupGet(p => p.DataType).Returns(publishedDataType);
+
+        var valueConverter = MultiUrlPickerValueConverter();
+
+        var inter = Serializer().Serialize(new[]
+        {
+            new MultiUrlPickerValueEditor.LinkDto
+            {
+                Udi = new GuidUdi(Constants.UdiEntityType.Media, PublishedMedia.Key),
+                Name = "Custom link name",
+                QueryString = "?something=true",
+                Target = "_blank"
+            }
+        });
+        var result = valueConverter.ConvertIntermediateToDeliveryApiObject(Mock.Of<IPublishedElement>(), publishedPropertyType.Object, PropertyCacheLevel.Element, inter, false, false) as IEnumerable<ApiLink>;
+        Assert.NotNull(result);
+        Assert.AreEqual(1, result.Count());
+        var link = result.First();
+        Assert.AreEqual("Custom link name", link.Title);
+        Assert.AreEqual(PublishedMedia.Key, link.DestinationId);
+        Assert.AreEqual("TheMediaType", link.DestinationType);
+        Assert.AreEqual("the-media-url?something=true", link.Url);
+        Assert.AreEqual(LinkType.Media, link.LinkType);
+        Assert.AreEqual("_blank", link.Target);
+        Assert.AreEqual("?something=true", link.QueryString);
+        Assert.AreEqual(null, link.Route);
+    }
+
     [Test]
     public void MultiUrlPickerValueConverter_AppliesExplicitConfigurationToContentLink()
     {
@@ -190,6 +224,7 @@ public class MultiUrlPickerValueConverterTests : PropertyValueConverterTests
         Assert.AreEqual("/the-page-url",  link.Route!.Path);
         Assert.AreEqual(LinkType.Content, link.LinkType);
         Assert.AreEqual("_blank", link.Target);
+        Assert.AreEqual("?something=true", link.QueryString);
         Assert.Null(link.Url);
     }
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs
index f029c42749..82aa79a27f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
@@ -49,6 +47,71 @@ public class ArtifactBaseTests
             string.Join(",", artifact.Dependencies.Select(x => x.Udi.ToString())));
     }
 
+    [Test]
+    public void Dependencies_Correctly_Updates_Mode()
+    {
+        var udi = Udi.Create(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
+
+        var dependencies = new ArtifactDependencyCollection
+        {
+            // Keep Match
+            new ArtifactDependency(udi, false, ArtifactDependencyMode.Match),
+            new ArtifactDependency(udi, false, ArtifactDependencyMode.Exist),
+        };
+
+        Assert.AreEqual(1, dependencies.Count);
+        var dependency = dependencies.First();
+        Assert.AreEqual(udi, dependency.Udi);
+        Assert.AreEqual(false, dependency.Ordering);
+        Assert.AreEqual(ArtifactDependencyMode.Match, dependency.Mode);
+        Assert.AreEqual(null, dependency.Checksum);
+    }
+
+    [Test]
+    public void Dependencies_Correctly_Updates_Ordering()
+    {
+        var udi = Udi.Create(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
+
+        var dependencies = new ArtifactDependencyCollection
+        {
+            // Keep ordering (regardless of mode)
+            new ArtifactDependency(udi, false, ArtifactDependencyMode.Match),
+            new ArtifactDependency(udi, false, ArtifactDependencyMode.Exist),
+            new ArtifactDependency(udi, true, ArtifactDependencyMode.Match),
+            new ArtifactDependency(udi, true, ArtifactDependencyMode.Exist),
+            new ArtifactDependency(udi, false, ArtifactDependencyMode.Match),
+            new ArtifactDependency(udi, false, ArtifactDependencyMode.Exist),
+        };
+
+        Assert.AreEqual(1, dependencies.Count);
+        var dependency = dependencies.First();
+        Assert.AreEqual(udi, dependency.Udi);
+        Assert.AreEqual(true, dependency.Ordering);
+        Assert.AreEqual(ArtifactDependencyMode.Match, dependency.Mode);
+        Assert.AreEqual(null, dependency.Checksum);
+    }
+
+    [Test]
+    public void Dependencies_Correctly_Updates_Checksum()
+    {
+        var udi = Udi.Create(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
+
+        var dependencies = new ArtifactDependencyCollection
+        {
+            // Keep checksum
+            new ArtifactDependency(udi, true, ArtifactDependencyMode.Match, "123"),
+            new ArtifactDependency(udi, true, ArtifactDependencyMode.Match, string.Empty),
+            new ArtifactDependency(udi, true, ArtifactDependencyMode.Match),
+        };
+
+        Assert.AreEqual(1, dependencies.Count);
+        var dependency = dependencies.First();
+        Assert.AreEqual(udi, dependency.Udi);
+        Assert.AreEqual(true, dependency.Ordering);
+        Assert.AreEqual(ArtifactDependencyMode.Match, dependency.Mode);
+        Assert.AreEqual("123", dependency.Checksum);
+    }
+
     private class TestArtifact : ArtifactBase<GuidUdi>
     {
         public TestArtifact(GuidUdi udi, IEnumerable<ArtifactDependency> dependencies = null)