diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6583d36179..5905850e62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,7 +96,7 @@ jobs:
       # Attempt to upload results even if test fails.
       # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
       - name: Upload Test Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}
diff --git a/.github/workflows/report-nunit.yml b/.github/workflows/report-nunit.yml
index a26723d84f..476000a223 100644
--- a/.github/workflows/report-nunit.yml
+++ b/.github/workflows/report-nunit.yml
@@ -5,30 +5,40 @@
 name: Annotate CI run with test results
 on:
   workflow_run:
-    workflows: ["Continuous Integration"]
+    workflows: [ "Continuous Integration" ]
     types:
       - completed
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   annotate:
     name: Annotate CI run with test results
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
-    strategy:
-       fail-fast: false
-       matrix:
-          os:
-            - { prettyname: Windows, configuration: Debug }
-            - { prettyname: macOS, configuration: Debug }
-            - { prettyname: Linux, configuration: Debug }
-            - { prettyname: Linux, configuration: Release }
-          threadingMode: ['SingleThread', 'MultiThreaded']
     timeout-minutes: 5
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.workflow_run.repository.full_name }}
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - name: Download results
+        uses: actions/download-artifact@v4
+        with:
+          pattern: osu-framework-test-results-*
+          merge-multiple: true
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ github.token }}
+
       - name: Annotate CI run with test results
         uses: dorny/test-reporter@v1.8.0
         with:
-          artifact: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}
-          name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}}, ${{matrix.os.configuration}})
+          name: Results
           path: "*.trx"
           reporter: dotnet-trx
           list-suites: 'failed'
diff --git a/osu.Framework.Tests/Dependencies/Reflection/CachedModelDependenciesTest.cs b/osu.Framework.Tests/Dependencies/Reflection/CachedModelDependenciesTest.cs
index 8c27434c91..02297e5bde 100644
--- a/osu.Framework.Tests/Dependencies/Reflection/CachedModelDependenciesTest.cs
+++ b/osu.Framework.Tests/Dependencies/Reflection/CachedModelDependenciesTest.cs
@@ -1,9 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
-using System;
 using System.Diagnostics.CodeAnalysis;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -15,24 +12,6 @@ namespace osu.Framework.Tests.Dependencies.Reflection
     [SuppressMessage("Performance", "OFSG001:Class contributes to dependency injection and should be partial")]
     public class CachedModelDependenciesTest
     {
-        [Test]
-        public void TestModelWithNonBindableFieldsFails()
-        {
-            IReadOnlyDependencyContainer unused;
-
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<NonBindablePublicFieldModel>(null));
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<NonBindablePrivateFieldModel>(null));
-        }
-
-        [Test]
-        public void TestModelWithNonReadOnlyFieldsFails()
-        {
-            IReadOnlyDependencyContainer unused;
-
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<NonReadOnlyFieldModel>(null));
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<PropertyModel>(null));
-        }
-
         [Test]
         public void TestSettingNoModelResolvesDefault()
         {
@@ -195,7 +174,7 @@ public void TestSetModelToNullAfterResolved()
 
             var model = new FieldModel { Bindable = { Value = 2 } };
 
-            var dependencies = new CachedModelDependencyContainer<FieldModel>(null)
+            var dependencies = new CachedModelDependencyContainer<FieldModel?>(null)
             {
                 Model = { Value = model }
             };
@@ -248,7 +227,7 @@ public void TestResolveIndividualProperties()
                 BindableString = { Value = "3" }
             };
 
-            var dependencies = new CachedModelDependencyContainer<DerivedFieldModel>(null)
+            var dependencies = new CachedModelDependencyContainer<DerivedFieldModel?>(null)
             {
                 Model = { Value = model1 }
             };
@@ -269,33 +248,6 @@ public void TestResolveIndividualProperties()
             Assert.AreEqual(null, resolver.BindableString.Value);
         }
 
-        private class NonBindablePublicFieldModel : IDependencyInjectionCandidate
-        {
-#pragma warning disable 649
-            public readonly int FailingField;
-#pragma warning restore 649
-        }
-
-        private class NonBindablePrivateFieldModel : IDependencyInjectionCandidate
-        {
-#pragma warning disable 169
-            private readonly int failingField;
-#pragma warning restore 169
-        }
-
-        private class NonReadOnlyFieldModel : IDependencyInjectionCandidate
-        {
-#pragma warning disable 649
-            public Bindable<int> Bindable;
-#pragma warning restore 649
-        }
-
-        private class PropertyModel : IDependencyInjectionCandidate
-        {
-            // ReSharper disable once UnusedMember.Local
-            public Bindable<int> Bindable { get; private set; }
-        }
-
         private class FieldModel : IDependencyInjectionCandidate
         {
             [Cached]
@@ -311,22 +263,22 @@ private class DerivedFieldModel : FieldModel
         private class FieldModelResolver : IDependencyInjectionCandidate
         {
             [Resolved]
-            public FieldModel Model { get; private set; }
+            public FieldModel Model { get; private set; } = null!;
         }
 
         private class DerivedFieldModelResolver : IDependencyInjectionCandidate
         {
             [Resolved]
-            public DerivedFieldModel Model { get; private set; }
+            public DerivedFieldModel Model { get; private set; } = null!;
         }
 
         private class DerivedFieldModelPropertyResolver : IDependencyInjectionCandidate
         {
             [Resolved(typeof(DerivedFieldModel))]
-            public Bindable<int> Bindable { get; private set; }
+            public Bindable<int> Bindable { get; private set; } = null!;
 
             [Resolved(typeof(DerivedFieldModel))]
-            public Bindable<string> BindableString { get; private set; }
+            public Bindable<string> BindableString { get; private set; } = null!;
         }
     }
 }
diff --git a/osu.Framework.Tests/Dependencies/SourceGeneration/CachedModelDependenciesTest.cs b/osu.Framework.Tests/Dependencies/SourceGeneration/CachedModelDependenciesTest.cs
index 8555380a72..84529a4ae5 100644
--- a/osu.Framework.Tests/Dependencies/SourceGeneration/CachedModelDependenciesTest.cs
+++ b/osu.Framework.Tests/Dependencies/SourceGeneration/CachedModelDependenciesTest.cs
@@ -1,9 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
-using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -13,24 +10,6 @@ namespace osu.Framework.Tests.Dependencies.SourceGeneration
     [TestFixture]
     public partial class CachedModelDependenciesTest
     {
-        [Test]
-        public void TestModelWithNonBindableFieldsFails()
-        {
-            IReadOnlyDependencyContainer unused;
-
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<NonBindablePublicFieldModel>(null));
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<NonBindablePrivateFieldModel>(null));
-        }
-
-        [Test]
-        public void TestModelWithNonReadOnlyFieldsFails()
-        {
-            IReadOnlyDependencyContainer unused;
-
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<NonReadOnlyFieldModel>(null));
-            Assert.Throws<TypeInitializationException>(() => unused = new CachedModelDependencyContainer<PropertyModel>(null));
-        }
-
         [Test]
         public void TestSettingNoModelResolvesDefault()
         {
@@ -193,7 +172,7 @@ public void TestSetModelToNullAfterResolved()
 
             var model = new FieldModel { Bindable = { Value = 2 } };
 
-            var dependencies = new CachedModelDependencyContainer<FieldModel>(null)
+            var dependencies = new CachedModelDependencyContainer<FieldModel?>(null)
             {
                 Model = { Value = model }
             };
@@ -246,7 +225,7 @@ public void TestResolveIndividualProperties()
                 BindableString = { Value = "3" }
             };
 
-            var dependencies = new CachedModelDependencyContainer<DerivedFieldModel>(null)
+            var dependencies = new CachedModelDependencyContainer<DerivedFieldModel?>(null)
             {
                 Model = { Value = model1 }
             };
@@ -267,33 +246,6 @@ public void TestResolveIndividualProperties()
             Assert.AreEqual(null, resolver.BindableString.Value);
         }
 
-        private partial class NonBindablePublicFieldModel : IDependencyInjectionCandidate
-        {
-#pragma warning disable 649
-            public readonly int FailingField;
-#pragma warning restore 649
-        }
-
-        private partial class NonBindablePrivateFieldModel : IDependencyInjectionCandidate
-        {
-#pragma warning disable 169
-            private readonly int failingField;
-#pragma warning restore 169
-        }
-
-        private partial class NonReadOnlyFieldModel : IDependencyInjectionCandidate
-        {
-#pragma warning disable 649
-            public Bindable<int> Bindable;
-#pragma warning restore 649
-        }
-
-        private partial class PropertyModel : IDependencyInjectionCandidate
-        {
-            // ReSharper disable once UnusedMember.Local
-            public Bindable<int> Bindable { get; private set; }
-        }
-
         private partial class FieldModel : IDependencyInjectionCandidate
         {
             [Cached]
@@ -309,22 +261,22 @@ private partial class DerivedFieldModel : FieldModel
         private partial class FieldModelResolver : IDependencyInjectionCandidate
         {
             [Resolved]
-            public FieldModel Model { get; private set; }
+            public FieldModel Model { get; private set; } = null!;
         }
 
         private partial class DerivedFieldModelResolver : IDependencyInjectionCandidate
         {
             [Resolved]
-            public DerivedFieldModel Model { get; private set; }
+            public DerivedFieldModel Model { get; private set; } = null!;
         }
 
         private partial class DerivedFieldModelPropertyResolver : IDependencyInjectionCandidate
         {
             [Resolved(typeof(DerivedFieldModel))]
-            public Bindable<int> Bindable { get; private set; }
+            public Bindable<int> Bindable { get; private set; } = null!;
 
             [Resolved(typeof(DerivedFieldModel))]
-            public Bindable<string> BindableString { get; private set; }
+            public Bindable<string> BindableString { get; private set; } = null!;
         }
     }
 }
diff --git a/osu.Framework.Tests/Graphics/RendererTest.cs b/osu.Framework.Tests/Graphics/RendererTest.cs
index 1f77e8e1cb..fd84554e2c 100644
--- a/osu.Framework.Tests/Graphics/RendererTest.cs
+++ b/osu.Framework.Tests/Graphics/RendererTest.cs
@@ -26,5 +26,28 @@ public void TestWhitePixelReuseUpdatesTextureWrapping()
             Assert.That(renderer.CurrentWrapModeS, Is.EqualTo(WrapMode.None));
             Assert.That(renderer.CurrentWrapModeS, Is.EqualTo(WrapMode.None));
         }
+
+        [Test]
+        public void TestTextureAtlasReuseUpdatesTextureWrapping()
+        {
+            DummyRenderer renderer = new DummyRenderer();
+
+            TextureAtlas atlas = new TextureAtlas(renderer, 1024, 1024);
+
+            Texture textureWrapNone = atlas.Add(100, 100, WrapMode.None, WrapMode.None)!;
+            Texture textureWrapClamp = atlas.Add(100, 100, WrapMode.ClampToEdge, WrapMode.ClampToEdge)!;
+
+            renderer.BindTexture(textureWrapNone, 0, null, null);
+            Assert.That(renderer.CurrentWrapModeS, Is.EqualTo(WrapMode.None));
+            Assert.That(renderer.CurrentWrapModeT, Is.EqualTo(WrapMode.None));
+
+            renderer.BindTexture(textureWrapClamp, 0, null, null);
+            Assert.That(renderer.CurrentWrapModeS, Is.EqualTo(WrapMode.ClampToEdge));
+            Assert.That(renderer.CurrentWrapModeT, Is.EqualTo(WrapMode.ClampToEdge));
+
+            renderer.BindTexture(textureWrapNone, 0, null, null);
+            Assert.That(renderer.CurrentWrapModeS, Is.EqualTo(WrapMode.None));
+            Assert.That(renderer.CurrentWrapModeT, Is.EqualTo(WrapMode.None));
+        }
     }
 }
diff --git a/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs b/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs
index 613421f7c7..602709ffc2 100644
--- a/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs
+++ b/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs
@@ -1,8 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing.Drawables.Steps;
@@ -22,12 +21,43 @@ public TestSceneStepButton()
                 Spacing = new Vector2(5),
                 Children = new Drawable[]
                 {
-                    new LabelStep { Text = nameof(LabelStep) },
-                    new AssertButton { Text = nameof(AssertButton), Assertion = () => true },
-                    new SingleStepButton { Text = nameof(SingleStepButton) },
-                    new RepeatStepButton(null) { Text = nameof(RepeatStepButton) },
-                    new ToggleStepButton(null) { Text = nameof(ToggleStepButton) },
-                    new UntilStepButton(() => true) { Text = nameof(UntilStepButton) },
+                    new LabelStep
+                    {
+                        Text = nameof(LabelStep),
+                        IsSetupStep = false,
+                        Action = _ => { },
+                    },
+                    new AssertButton
+                    {
+                        Text = nameof(AssertButton),
+                        IsSetupStep = false,
+                        Assertion = () => true,
+                        CallStack = new StackTrace()
+                    },
+                    new SingleStepButton
+                    {
+                        Text = nameof(SingleStepButton),
+                        IsSetupStep = false,
+                        Action = () => { }
+                    },
+                    new RepeatStepButton
+                    {
+                        Text = nameof(RepeatStepButton),
+                        IsSetupStep = false
+                    },
+                    new ToggleStepButton
+                    {
+                        Text = nameof(ToggleStepButton),
+                        IsSetupStep = false,
+                        Action = _ => { }
+                    },
+                    new UntilStepButton
+                    {
+                        Text = nameof(UntilStepButton),
+                        IsSetupStep = false,
+                        Assertion = () => true,
+                        CallStack = new StackTrace()
+                    },
                     new StepSlider<int>(nameof(StepSlider<int>), 0, 10, 5),
                 }
             };
diff --git a/osu.Framework.Tests/Visual/Testing/TestSceneTest.cs b/osu.Framework.Tests/Visual/Testing/TestSceneTest.cs
index c93a996bc7..26ba31bf95 100644
--- a/osu.Framework.Tests/Visual/Testing/TestSceneTest.cs
+++ b/osu.Framework.Tests/Visual/Testing/TestSceneTest.cs
@@ -38,9 +38,10 @@ public virtual void SetUpSteps()
             if (DebugUtils.IsNUnitRunning && TestContext.CurrentContext.Test.MethodName == nameof(TestConstructor))
                 return;
 
-            AddStep(new SingleStepButton(true)
+            AddStep(new SingleStepButton
             {
-                Name = "set up dummy",
+                Text = "set up dummy",
+                IsSetupStep = true,
                 Action = () => setupStepsDummyRun++
             });
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
index 83450a664e..9c3ede1100 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,9 +19,8 @@ namespace osu.Framework.Tests.Visual.UserInterface
 {
     public partial class TestSceneRearrangeableListContainer : ManualInputManagerTestScene
     {
-        private TestRearrangeableList list;
-
-        private Container listContainer;
+        private TestRearrangeableList list = null!;
+        private Container listContainer = null!;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -85,7 +82,7 @@ public void TestRemoveItem()
 
             addItems(item_count);
 
-            List<Drawable> items = null;
+            List<Drawable> items = null!;
 
             AddStep("get item references", () => items = new List<Drawable>(list.ItemMap.Values.ToList()));
 
@@ -278,7 +275,7 @@ public void TestNotScrolledToTopOnRemove()
         [Test]
         public void TestRemoveDuringLoadAndReAdd()
         {
-            TestDelayedLoadRearrangeableList delayedList = null;
+            TestDelayedLoadRearrangeableList delayedList = null!;
 
             AddStep("create list", () => Child = delayedList = new TestDelayedLoadRearrangeableList());
 
@@ -327,6 +324,24 @@ public void TestDragSynchronisation()
             });
         }
 
+        [Test]
+        public void TestReplaceEntireList()
+        {
+            addItems(1);
+
+            AddStep("replace list", () => list.Items.ReplaceRange(0, list.Items.Count, [100]));
+            AddUntilStep("wait for items to load", () => list.ItemMap.Values.All(i => i.IsLoaded));
+        }
+
+        [Test]
+        public void TestPartialReplace()
+        {
+            addItems(5);
+
+            AddStep("replace list", () => list.Items.ReplaceRange(2, 2, [100, 101]));
+            AddUntilStep("wait for items to load", () => list.ItemMap.Values.All(i => i.IsLoaded));
+        }
+
         private void addDragSteps(int from, int to, int[] expectedSequence)
         {
             AddStep($"move to {from}", () =>
diff --git a/osu.Framework.iOS/IOSGameHost.cs b/osu.Framework.iOS/IOSGameHost.cs
index 813d6133e6..7b696fd97f 100644
--- a/osu.Framework.iOS/IOSGameHost.cs
+++ b/osu.Framework.iOS/IOSGameHost.cs
@@ -38,8 +38,6 @@ protected override void SetupConfig(IDictionary<FrameworkSetting, object> defaul
             base.SetupConfig(defaultOverrides);
         }
 
-        public override bool OnScreenKeyboardOverlapsGameWindow => true;
-
         public override bool CanExit => false;
 
         public override Storage GetStorage(string path) => new IOSStorage(path, this);
diff --git a/osu.Framework.iOS/IOSWindow.cs b/osu.Framework.iOS/IOSWindow.cs
index 5444664a88..1583ffccb8 100644
--- a/osu.Framework.iOS/IOSWindow.cs
+++ b/osu.Framework.iOS/IOSWindow.cs
@@ -11,7 +11,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Platform.SDL3;
-using SDL;
 using static SDL.SDL3;
 using UIKit;
 
diff --git a/osu.Framework/Allocation/CachedModelDependencyContainer.cs b/osu.Framework/Allocation/CachedModelDependencyContainer.cs
index ec3f0768f1..12f37dbe87 100644
--- a/osu.Framework/Allocation/CachedModelDependencyContainer.cs
+++ b/osu.Framework/Allocation/CachedModelDependencyContainer.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Reflection;
 using osu.Framework.Bindables;
@@ -19,7 +17,7 @@ namespace osu.Framework.Allocation
     /// </remarks>
     /// <typeparam name="TModel">The type of the model to cache. Must contain only <see cref="Bindable{T}"/> fields or auto-properties.</typeparam>
     public class CachedModelDependencyContainer<TModel> : IReadOnlyDependencyContainer
-        where TModel : class, IDependencyInjectionCandidate, new()
+        where TModel : class?, IDependencyInjectionCandidate?, new()
     {
         private const BindingFlags activator_flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly;
 
@@ -32,17 +30,16 @@ public class CachedModelDependencyContainer<TModel> : IReadOnlyDependencyContain
         public readonly Bindable<TModel> Model = new Bindable<TModel>();
 
         private readonly TModel shadowModel = new TModel();
-
-        private readonly IReadOnlyDependencyContainer parent;
+        private readonly IReadOnlyDependencyContainer? parent;
         private readonly IReadOnlyDependencyContainer shadowDependencies;
 
-        public CachedModelDependencyContainer(IReadOnlyDependencyContainer parent)
+        public CachedModelDependencyContainer(IReadOnlyDependencyContainer? parent)
         {
             this.parent = parent;
 
             shadowDependencies = DependencyActivator.MergeDependencies(shadowModel, null, new CacheInfo(parent: typeof(TModel)));
 
-            TModel currentModel = null;
+            TModel? currentModel = null;
             Model.BindValueChanged(e =>
             {
                 // When setting a null model, we actually want to reset the shadow model to a default state
@@ -55,9 +52,9 @@ public CachedModelDependencyContainer(IReadOnlyDependencyContainer parent)
             });
         }
 
-        public object Get(Type type) => Get(type, default);
+        public object? Get(Type type) => Get(type, default);
 
-        public object Get(Type type, CacheInfo info)
+        public object? Get(Type type, CacheInfo info)
         {
             if (info.Parent == null)
                 return type == typeof(TModel) ? createChildShadowModel() : parent?.Get(type, info);
@@ -87,65 +84,43 @@ private TModel createChildShadowModel()
         /// <param name="targetShadowModel">The shadow model to update.</param>
         /// <param name="lastModel">The model to unbind from.</param>
         /// <param name="newModel">The model to bind to.</param>
-        private void updateShadowModel(TModel targetShadowModel, TModel lastModel, TModel newModel)
+        private void updateShadowModel(TModel targetShadowModel, TModel? lastModel, TModel newModel)
         {
-            // Due to static-constructor checks, we are guaranteed that all fields will be IBindable
-
-            foreach (var type in typeof(TModel).EnumerateBaseTypes())
+            if (lastModel != null)
             {
-                foreach (var field in type.GetFields(activator_flags))
+                foreach (var type in typeof(TModel).EnumerateBaseTypes())
                 {
-                    perform(targetShadowModel, field, lastModel, (shadowProp, modelProp) => shadowProp.UnbindFrom(modelProp));
+                    foreach (var field in type.GetFields(activator_flags))
+                        perform(field, targetShadowModel, lastModel, (shadowProp, modelProp) => shadowProp.UnbindFrom(modelProp));
                 }
             }
 
             foreach (var type in typeof(TModel).EnumerateBaseTypes())
             {
                 foreach (var field in type.GetFields(activator_flags))
-                {
-                    perform(targetShadowModel, field, newModel, (shadowProp, modelProp) => shadowProp.BindTo(modelProp));
-                }
+                    perform(field, targetShadowModel, newModel, (shadowProp, modelProp) => shadowProp.BindTo(modelProp));
             }
         }
 
         /// <summary>
         /// Perform an arbitrary action across a shadow model and model.
         /// </summary>
-        private void perform(TModel targetShadowModel, MemberInfo member, TModel target, Action<IBindable, IBindable> action)
+        private static void perform(FieldInfo field, TModel shadowModel, TModel targetModel, Action<IBindable, IBindable> action)
         {
-            if (target == null) return;
+            IBindable? shadowBindable = null;
+            IBindable? targetBindable = null;
 
-            switch (member)
+            try
             {
-                case PropertyInfo pi:
-                    action((IBindable)pi.GetValue(targetShadowModel), (IBindable)pi.GetValue(target));
-                    break;
-
-                case FieldInfo fi:
-                    action((IBindable)fi.GetValue(targetShadowModel), (IBindable)fi.GetValue(target));
-                    break;
+                shadowBindable = field.GetValue(shadowModel) as IBindable;
+                targetBindable = field.GetValue(targetModel) as IBindable;
             }
-        }
-
-        static CachedModelDependencyContainer()
-        {
-            foreach (var type in typeof(TModel).EnumerateBaseTypes())
+            catch
             {
-                foreach (var field in type.GetFields(activator_flags))
-                {
-                    if (!typeof(IBindable).IsAssignableFrom(field.FieldType))
-                    {
-                        throw new InvalidOperationException($"\"{field.DeclaringType}.{field.Name}\" does not subclass {nameof(IBindable)}. "
-                                                            + $"All fields of {typeof(TModel)} must subclass {nameof(IBindable)} to be used in a {nameof(CachedModelDependencyContainer<TModel>)}.");
-                    }
-
-                    if (!field.IsInitOnly)
-                    {
-                        throw new InvalidOperationException($"\"{field.DeclaringType}.{field.Name}\" is not readonly. "
-                                                            + $"All fields of {typeof(TModel)} must be readonly to be used in a {nameof(CachedModelDependencyContainer<TModel>)}.");
-                    }
-                }
             }
+
+            if (shadowBindable != null && targetBindable != null)
+                action(shadowBindable, targetBindable);
         }
     }
 }
diff --git a/osu.Framework/FrameworkEnvironment.cs b/osu.Framework/FrameworkEnvironment.cs
index f5c4369bbc..5b4b5ee8ee 100644
--- a/osu.Framework/FrameworkEnvironment.cs
+++ b/osu.Framework/FrameworkEnvironment.cs
@@ -53,7 +53,7 @@ static FrameworkEnvironment()
             if (DebugUtils.IsDebugBuild)
                 AllowInsecureRequests = parseBool(Environment.GetEnvironmentVariable("OSU_INSECURE_REQUESTS")) ?? false;
 
-            UseSDL3 = RuntimeInfo.IsMobile || (parseBool(Environment.GetEnvironmentVariable("OSU_SDL3")) ?? true);
+            UseSDL3 = RuntimeInfo.IsMobile || (parseBool(Environment.GetEnvironmentVariable("OSU_SDL3")) ?? false);
         }
 
         private static bool? parseBool(string? value)
diff --git a/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs b/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
index 1363206638..b133534c31 100644
--- a/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
+++ b/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
@@ -183,11 +183,15 @@ private void sortItems()
         {
             for (int i = 0; i < Items.Count; i++)
             {
-                var drawable = itemMap[Items[i]];
+                // A drawable for the item may not exist yet, for example in a replace-range operation where the removal happens first.
+                if (!itemMap.TryGetValue(Items[i], out var drawable))
+                    continue;
+
+                // The item may not be loaded yet, because add operations are asynchronous.
+                if (drawable.Parent != ListContainer)
+                    continue;
 
-                // If the async load didn't complete, the item wouldn't exist in the container and an exception would be thrown
-                if (drawable.Parent == ListContainer)
-                    ListContainer!.SetLayoutPosition(drawable, i);
+                ListContainer!.SetLayoutPosition(drawable, i);
             }
         }
 
diff --git a/osu.Framework/Graphics/Containers/ScrollContainer.cs b/osu.Framework/Graphics/Containers/ScrollContainer.cs
index eae4c968ee..dbd89fed1c 100644
--- a/osu.Framework/Graphics/Containers/ScrollContainer.cs
+++ b/osu.Framework/Graphics/Containers/ScrollContainer.cs
@@ -136,7 +136,10 @@ public bool ScrollbarOverlapsContent
         /// <summary>
         /// The maximum distance that the scrollbar can move in the scroll direction.
         /// </summary>
-        public float ScrollbarMovementExtent => Math.Max(DisplayableContent - Scrollbar.DrawSize[ScrollDim], 0);
+        /// <remarks>
+        /// May not be accurate to actual display of scrollbar if <see cref="ToScrollbarPosition"/> or <see cref="FromScrollbarPosition"/> are overridden.
+        /// </remarks>
+        protected float ScrollbarMovementExtent => Math.Max(DisplayableContent - Scrollbar.DrawSize[ScrollDim], 0);
 
         /// <summary>
         /// Clamp a value to the available scroll range.
@@ -409,7 +412,7 @@ protected override bool OnScroll(ScrollEvent e)
             return true;
         }
 
-        private void onScrollbarMovement(float value) => OnUserScroll(Clamp(fromScrollbarPosition(value)), false);
+        private void onScrollbarMovement(float value) => OnUserScroll(Clamp(FromScrollbarPosition(value)), false);
 
         /// <summary>
         /// Immediately offsets the current and target scroll position.
@@ -576,12 +579,12 @@ protected override void UpdateAfterChildren()
 
             if (ScrollDirection == Direction.Horizontal)
             {
-                Scrollbar.X = toScrollbarPosition(Current);
+                Scrollbar.X = ToScrollbarPosition(Current);
                 ScrollContent.X = -Current + ScrollableExtent * ScrollContent.RelativeAnchorPosition.X;
             }
             else
             {
-                Scrollbar.Y = toScrollbarPosition(Current);
+                Scrollbar.Y = ToScrollbarPosition(Current);
                 ScrollContent.Y = -Current + ScrollableExtent * ScrollContent.RelativeAnchorPosition.Y;
             }
         }
@@ -591,7 +594,7 @@ protected override void UpdateAfterChildren()
         /// </summary>
         /// <param name="scrollPosition">The absolute scroll position (e.g. <see cref="Current"/>).</param>
         /// <returns>The scrollbar position.</returns>
-        private float toScrollbarPosition(float scrollPosition)
+        protected virtual float ToScrollbarPosition(float scrollPosition)
         {
             if (Precision.AlmostEquals(0, ScrollableExtent))
                 return 0;
@@ -604,7 +607,7 @@ private float toScrollbarPosition(float scrollPosition)
         /// </summary>
         /// <param name="scrollbarPosition">The scrollbar position.</param>
         /// <returns>The absolute scroll position.</returns>
-        private float fromScrollbarPosition(float scrollbarPosition)
+        protected virtual float FromScrollbarPosition(float scrollbarPosition)
         {
             if (Precision.AlmostEquals(0, ScrollbarMovementExtent))
                 return 0;
diff --git a/osu.Framework/Graphics/Rendering/Renderer.cs b/osu.Framework/Graphics/Rendering/Renderer.cs
index 8066d379ed..01a8a1f39a 100644
--- a/osu.Framework/Graphics/Rendering/Renderer.cs
+++ b/osu.Framework/Graphics/Rendering/Renderer.cs
@@ -818,7 +818,10 @@ public bool BindTexture(Texture texture, int unit, WrapMode? wrapModeS, WrapMode
         public bool BindTexture(INativeTexture texture, int unit = 0, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
         {
             if (lastActiveTextureUnit == unit && lastBoundTexture[unit] == texture)
+            {
+                setWrapMode(wrapModeS, wrapModeT);
                 return true;
+            }
 
             FlushCurrentBatch(FlushBatchSource.BindTexture);
 
diff --git a/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs b/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs
index c66615f740..df0a4810fb 100644
--- a/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs
+++ b/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs
@@ -207,6 +207,8 @@ protected override void Update()
             overlay.Target = Searching ? cursorTarget : inputManager.HoveredDrawables.OfType<VisualisedDrawable>().FirstOrDefault()?.Target;
         }
 
+        private static readonly Dictionary<Type, bool> is_type_valid_target_cache = new Dictionary<Type, bool>();
+
         private void updateCursorTarget()
         {
             Drawable drawableTarget = null;
@@ -220,6 +222,14 @@ private void updateCursorTarget()
             // Finds the targeted drawable and composite drawable. The search stops if a drawable is targeted.
             void findTarget(Drawable drawable)
             {
+                // Ignore proxied drawables (they may be at a different visual layer).
+                if (drawable.HasProxy)
+                    return;
+
+                // When a proxy is encountered, restore the original drawable for target testing.
+                while (drawable.IsProxy)
+                    drawable = drawable.Original;
+
                 if (drawable == this || drawable is Component)
                     return;
 
@@ -268,30 +278,32 @@ void findTarget(Drawable drawable)
                     if (!validForTarget(drawable))
                         return;
 
-                    // Special case for full-screen overlays that act as input receptors, but don't display anything
-                    if (!hasCustomDrawNode(drawable))
-                        return;
-
                     drawableTarget = drawable;
                 }
             }
 
             // Valid if the drawable contains the mouse position and the position wouldn't be masked by the parent
             bool validForTarget(Drawable drawable)
-                => drawable.ScreenSpaceDrawQuad.Contains(inputManager.CurrentState.Mouse.Position)
-                   && maskingQuad?.Contains(inputManager.CurrentState.Mouse.Position) != false;
-        }
+            {
+                if (!drawable.ScreenSpaceDrawQuad.Contains(inputManager.CurrentState.Mouse.Position)
+                    || maskingQuad?.Contains(inputManager.CurrentState.Mouse.Position) == false)
+                {
+                    return false;
+                }
 
-        private static readonly Dictionary<Type, bool> has_custom_drawnode_cache = new Dictionary<Type, bool>();
+                Type type = drawable.GetType();
 
-        private bool hasCustomDrawNode(Drawable drawable)
-        {
-            var type = drawable.GetType();
+                if (is_type_valid_target_cache.TryGetValue(type, out bool valid))
+                    return valid;
 
-            if (has_custom_drawnode_cache.TryGetValue(type, out bool existing))
-                return existing;
+                // Exclude "overlay" objects (Component/etc) that don't draw anything and don't override CreateDrawNode().
+                valid = type.GetMethod(nameof(CreateDrawNode), BindingFlags.Instance | BindingFlags.NonPublic)?.DeclaringType != typeof(Drawable);
+
+                // Exclude objects that specify they should be hidden anyway.
+                valid &= !type.GetCustomAttributes<DrawVisualiserHiddenAttribute>(true).Any();
 
-            return has_custom_drawnode_cache[type] = type.GetMethod(nameof(CreateDrawNode), BindingFlags.Instance | BindingFlags.NonPublic)?.DeclaringType != typeof(Drawable);
+                return is_type_valid_target_cache[type] = valid;
+            }
         }
 
         public bool Searching { get; private set; }
diff --git a/osu.Framework/Graphics/Visualisation/DrawVisualiserHiddenAttribute.cs b/osu.Framework/Graphics/Visualisation/DrawVisualiserHiddenAttribute.cs
new file mode 100644
index 0000000000..c5c62d683c
--- /dev/null
+++ b/osu.Framework/Graphics/Visualisation/DrawVisualiserHiddenAttribute.cs
@@ -0,0 +1,13 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+
+namespace osu.Framework.Graphics.Visualisation
+{
+    /// <summary>
+    /// Indicates that instances of this type or any subtype should not be valid targets for the draw visualiser.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class DrawVisualiserHiddenAttribute : Attribute;
+}
diff --git a/osu.Framework/IO/Network/WebRequest.cs b/osu.Framework/IO/Network/WebRequest.cs
index 4fff194c84..e3d5a91b48 100644
--- a/osu.Framework/IO/Network/WebRequest.cs
+++ b/osu.Framework/IO/Network/WebRequest.cs
@@ -119,7 +119,7 @@ public class WebRequest : IDisposable
         /// <summary>
         /// FILE parameters.
         /// </summary>
-        private readonly IDictionary<string, byte[]> files = new Dictionary<string, byte[]>();
+        private readonly List<FormFile> files = new List<FormFile>();
 
         /// <summary>
         /// The request headers.
@@ -349,9 +349,9 @@ private async Task internalPerform(CancellationToken cancellationToken = default
 
                             foreach (var p in files)
                             {
-                                var byteContent = new ByteArrayContent(p.Value);
+                                var byteContent = new ByteArrayContent(p.Content);
                                 byteContent.Headers.Add("Content-Type", "application/octet-stream");
-                                formData.Add(byteContent, p.Key, p.Key);
+                                formData.Add(byteContent, p.ParamName, p.Filename);
                             }
 
                             postContent = await formData.ReadAsStreamAsync(linkedToken.Token).ConfigureAwait(false);
@@ -662,17 +662,21 @@ public void AddRaw(Stream stream)
         }
 
         /// <summary>
-        /// Add a new FILE parameter to this request. Replaces any existing file with the same name.
+        /// Add a new FILE parameter to this request.
         /// This may not be used in conjunction with <see cref="AddRaw(Stream)"/>. GET requests may not contain files.
         /// </summary>
-        /// <param name="name">The name of the file. This becomes the name of the file in a multi-part form POST content.</param>
+        /// <param name="paramName">The name of the form parameter of the request that the file relates to.</param>
         /// <param name="data">The file data.</param>
-        public void AddFile(string name, byte[] data)
+        /// <param name="filename">
+        /// The filename of the file to be sent to be reported to the server in the <c>Content-Disposition</c> header.
+        /// <c>blob</c> is used by default if omitted, to <see href="https://developer.mozilla.org/en-US/docs/Web/API/FormData/append#filename">mirror browser behaviour</see>.
+        /// </param>
+        public void AddFile(string paramName, byte[] data, string filename = "blob")
         {
-            ArgumentNullException.ThrowIfNull(name);
+            ArgumentNullException.ThrowIfNull(paramName);
             ArgumentNullException.ThrowIfNull(data);
 
-            files[name] = data;
+            files.Add(new FormFile(paramName, data, filename));
         }
 
         /// <summary>
@@ -931,5 +935,7 @@ protected override void Dispose(bool disposing)
                 baseStream.Dispose();
             }
         }
+
+        private record struct FormFile(string ParamName, byte[] Content, string Filename);
     }
 }
diff --git a/osu.Framework/Platform/GameHost.cs b/osu.Framework/Platform/GameHost.cs
index e5ed5aa6b5..4eab59a416 100644
--- a/osu.Framework/Platform/GameHost.cs
+++ b/osu.Framework/Platform/GameHost.cs
@@ -122,7 +122,8 @@ public abstract class GameHost : IIpcHost, IDisposable
         public event Func<IpcMessage, IpcMessage> MessageReceived;
 
         /// <summary>
-        /// Whether the on screen keyboard covers a portion of the game window when presented to the user.
+        /// Whether the on-screen keyboard covers a portion of the game window when presented to the user.
+        /// This is usually true on mobile platforms, but may change to false if a hardware keyboard is connected.
         /// </summary>
         public virtual bool OnScreenKeyboardOverlapsGameWindow => false;
 
diff --git a/osu.Framework/Platform/ISDLWindow.cs b/osu.Framework/Platform/ISDLWindow.cs
index 66f627e28e..640cd8b099 100644
--- a/osu.Framework/Platform/ISDLWindow.cs
+++ b/osu.Framework/Platform/ISDLWindow.cs
@@ -39,6 +39,7 @@ internal interface ISDLWindow : IWindow
         bool MouseAutoCapture { set; }
         bool RelativeMouseMode { get; set; }
         bool CapsLockPressed { get; }
+        bool KeyboardAttached { get; }
 
         void UpdateMousePosition(Vector2 position);
 
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.cs b/osu.Framework/Platform/SDL2/SDL2Window.cs
index 7a62f84d7c..1efa878477 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.cs
@@ -165,6 +165,8 @@ internal SDL_SysWMinfo GetWindowSystemInformation()
 
         public bool CapsLockPressed => SDL_GetModState().HasFlagFast(SDL_Keymod.KMOD_CAPS);
 
+        public bool KeyboardAttached => true; // SDL2 has no way of knowing whether a keyboard is attached, assume true.
+
         // references must be kept to avoid GC, see https://stackoverflow.com/a/6193914
 
         [UsedImplicitly]
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.cs b/osu.Framework/Platform/SDL3/SDL3Window.cs
index ad30b20ad9..bb03b60937 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.cs
@@ -145,6 +145,8 @@ public IntPtr DisplayHandle
 
         public bool CapsLockPressed => SDL_GetModState().HasFlagFast(SDL_Keymod.SDL_KMOD_CAPS);
 
+        public bool KeyboardAttached => SDL_HasKeyboard();
+
         /// <summary>
         /// Represents a handle to this <see cref="SDL3Window"/> instance, used for unmanaged callbacks.
         /// </summary>
@@ -205,10 +207,10 @@ public virtual void Create()
             flags |= graphicsSurface.Type.ToFlags();
 
             SDL_SetHint(SDL_HINT_WINDOWS_CLOSE_ON_ALT_F4, "0"u8);
-            SDL_SetHint(SDL_HINT_IME_IMPLEMENTED_UI, "0"u8);
             SDL_SetHint(SDL_HINT_MOUSE_RELATIVE_MODE_CENTER, "0"u8);
             SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0"u8); // disable touch events generating synthetic mouse events on desktop platforms
             SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0"u8); // disable mouse events generating synthetic touch events on mobile platforms
+            SDL_SetHint(SDL_HINT_IME_IMPLEMENTED_UI, "composition"u8);
 
             SDLWindowHandle = SDL_CreateWindow(title, Size.Width, Size.Height, flags);
 
@@ -501,11 +503,11 @@ protected virtual void HandleEvent(SDL_Event e)
                     break;
 
                 case SDL_EventType.SDL_EVENT_TEXT_EDITING:
-                    HandleTextEditingEvent(e.edit);
+                    handleTextEditingEvent(e.edit);
                     break;
 
                 case SDL_EventType.SDL_EVENT_TEXT_INPUT:
-                    HandleTextInputEvent(e.text);
+                    handleTextInputEvent(e.text);
                     break;
 
                 case SDL_EventType.SDL_EVENT_KEYMAP_CHANGED:
diff --git a/osu.Framework/Platform/SDL3/SDL3Window_Input.cs b/osu.Framework/Platform/SDL3/SDL3Window_Input.cs
index 5c340f8e37..7709f531eb 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window_Input.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window_Input.cs
@@ -472,18 +472,18 @@ private void handleMouseMotionEvent(SDL_MouseMotionEvent evtMotion)
                 MouseMoveRelative?.Invoke(new Vector2(evtMotion.xrel * Scale, evtMotion.yrel * Scale));
         }
 
-        protected virtual void HandleTextInputEvent(SDL_TextInputEvent evtText)
+        private void handleTextInputEvent(SDL_TextInputEvent evtText)
         {
             string? text = evtText.GetText();
             Debug.Assert(text != null);
-            TriggerTextInput(text);
+            TextInput?.Invoke(text);
         }
 
-        protected virtual void HandleTextEditingEvent(SDL_TextEditingEvent evtEdit)
+        private void handleTextEditingEvent(SDL_TextEditingEvent evtEdit)
         {
             string? text = evtEdit.GetText();
             Debug.Assert(text != null);
-            TriggerTextEditing(text, evtEdit.start, evtEdit.length);
+            TextEditing?.Invoke(text, evtEdit.start, evtEdit.length);
         }
 
         private void handleKeyboardEvent(SDL_KeyboardEvent evtKey)
@@ -713,15 +713,11 @@ private void updateConfineMode()
         /// </summary>
         public event Action<string>? TextInput;
 
-        protected void TriggerTextInput(string text) => TextInput?.Invoke(text);
-
         /// <summary>
         /// Invoked when an IME text editing event occurs.
         /// </summary>
         public event TextEditingDelegate? TextEditing;
 
-        protected void TriggerTextEditing(string text, int start, int length) => TextEditing?.Invoke(text, start, length);
-
         /// <inheritdoc cref="IWindow.KeymapChanged"/>
         public event Action? KeymapChanged;
 
diff --git a/osu.Framework/Platform/SDLGameHost.cs b/osu.Framework/Platform/SDLGameHost.cs
index 41e237db9b..042a7fc9a9 100644
--- a/osu.Framework/Platform/SDLGameHost.cs
+++ b/osu.Framework/Platform/SDLGameHost.cs
@@ -20,6 +20,8 @@ public abstract class SDLGameHost : GameHost
     {
         public override bool CapsLockEnabled => (Window as ISDLWindow)?.CapsLockPressed == true;
 
+        public override bool OnScreenKeyboardOverlapsGameWindow => (Window as ISDLWindow)?.KeyboardAttached == false;
+
         protected SDLGameHost(string gameName, HostOptions? options = null)
             : base(gameName, options)
         {
diff --git a/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs b/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs
index 7c065b98f2..d04ea28ba1 100644
--- a/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs
+++ b/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs
@@ -2,12 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Drawing;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using osu.Framework.Allocation;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform.SDL3;
 using osu.Framework.Platform.Windows.Native;
@@ -62,36 +59,6 @@ public override void Create()
                 Native.Input.SetWindowFeedbackSetting(WindowHandle, feedbackType, false);
         }
 
-        public override unsafe void Run()
-        {
-            SDL_SetWindowsMessageHook(&messageHook, ObjectHandle.Handle);
-            base.Run();
-        }
-
-        [UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvCdecl) })]
-        private static unsafe SDLBool messageHook(IntPtr userdata, MSG* msg)
-        {
-            var handle = new ObjectHandle<SDL3WindowsWindow>(userdata);
-            if (handle.GetTarget(out SDL3WindowsWindow window))
-                return window.handleEventFromHook(*msg);
-
-            return true;
-        }
-
-        private SDLBool handleEventFromHook(MSG msg)
-        {
-            switch (msg.message)
-            {
-                case Imm.WM_IME_STARTCOMPOSITION:
-                case Imm.WM_IME_COMPOSITION:
-                case Imm.WM_IME_ENDCOMPOSITION:
-                    handleImeMessage(msg.hwnd, msg.message, msg.lParam);
-                    break;
-            }
-
-            return true;
-        }
-
         protected override void HandleEventFromFilter(SDL_Event evt)
         {
             switch (evt.Type)
@@ -125,8 +92,6 @@ private void warpCursorFromFocusLoss()
             }
         }
 
-        #region IME handling
-
         public override void StartTextInput(bool allowIme)
         {
             base.StartTextInput(allowIme);
@@ -135,82 +100,6 @@ public override void StartTextInput(bool allowIme)
 
         public override void ResetIme() => ScheduleCommand(() => Imm.CancelComposition(WindowHandle));
 
-        protected override void HandleTextInputEvent(SDL_TextInputEvent evtText)
-        {
-            string? sdlResult = evtText.GetText();
-            Debug.Assert(sdlResult != null);
-
-            // Block SDL text input if it was already handled by `handleImeMessage()`.
-            // SDL truncates text over 32 bytes and sends it as multiple events.
-            // We assume these events will be handled in the same `pollSDLEvents()` call.
-            if (lastImeResult?.Contains(sdlResult) == true)
-            {
-                // clear the result after this SDL event loop finishes so normal text input isn't blocked.
-                EventScheduler.AddOnce(() => lastImeResult = null);
-                return;
-            }
-
-            // also block if there is an ongoing composition (unlikely to occur).
-            if (imeCompositionActive) return;
-
-            base.HandleTextInputEvent(evtText);
-        }
-
-        protected override void HandleTextEditingEvent(SDL_TextEditingEvent evtEdit)
-        {
-            // handled by custom logic below
-        }
-
-        /// <summary>
-        /// Whether IME composition is active.
-        /// </summary>
-        /// <remarks>Used for blocking SDL IME results since we handle those ourselves.</remarks>
-        private bool imeCompositionActive;
-
-        /// <summary>
-        /// The last IME result.
-        /// </summary>
-        /// <remarks>
-        /// Used for blocking SDL IME results since we handle those ourselves.
-        /// Cleared when the SDL events are blocked.
-        /// </remarks>
-        private string? lastImeResult;
-
-        private void handleImeMessage(IntPtr hWnd, uint uMsg, long lParam)
-        {
-            switch (uMsg)
-            {
-                case Imm.WM_IME_STARTCOMPOSITION:
-                    imeCompositionActive = true;
-                    ScheduleEvent(() => TriggerTextEditing(string.Empty, 0, 0));
-                    break;
-
-                case Imm.WM_IME_COMPOSITION:
-                    using (var inputContext = new Imm.InputContext(hWnd, lParam))
-                    {
-                        if (inputContext.TryGetImeResult(out string? resultText))
-                        {
-                            lastImeResult = resultText;
-                            ScheduleEvent(() => TriggerTextInput(resultText));
-                        }
-
-                        if (inputContext.TryGetImeComposition(out string? compositionText, out int start, out int length))
-                        {
-                            ScheduleEvent(() => TriggerTextEditing(compositionText, start, length));
-                        }
-                    }
-
-                    break;
-
-                case Imm.WM_IME_ENDCOMPOSITION:
-                    imeCompositionActive = false;
-                    ScheduleEvent(() => TriggerTextEditing(string.Empty, 0, 0));
-                    break;
-            }
-        }
-
-        #endregion
-
         protected override void HandleTouchFingerEvent(SDL_TouchFingerEvent evtTfinger)
         {
             if (evtTfinger.TryGetTouchName(out string? name) && name == "pen")
diff --git a/osu.Framework/Testing/Drawables/Steps/AssertButton.cs b/osu.Framework/Testing/Drawables/Steps/AssertButton.cs
index e75e05fb03..d910acb964 100644
--- a/osu.Framework/Testing/Drawables/Steps/AssertButton.cs
+++ b/osu.Framework/Testing/Drawables/Steps/AssertButton.cs
@@ -1,10 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
+using System.Runtime.ExceptionServices;
 using System.Text;
 using NUnit.Framework;
 using osuTK.Graphics;
@@ -13,15 +12,14 @@ namespace osu.Framework.Testing.Drawables.Steps
 {
     public partial class AssertButton : StepButton
     {
-        public Func<bool> Assertion;
-        public string ExtendedDescription;
-        public StackTrace CallStack;
-        private readonly Func<string> getFailureMessage;
+        public required StackTrace CallStack { get; init; }
+        public required Func<bool> Assertion { get; init; }
+        public Func<string>? GetFailureMessage { get; init; }
+
+        public string? ExtendedDescription { get; init; }
 
-        public AssertButton(bool isSetupStep = false, Func<string> getFailureMessage = null)
-            : base(isSetupStep)
+        public AssertButton()
         {
-            this.getFailureMessage = getFailureMessage;
             Action += checkAssert;
             LightColour = Color4.OrangeRed;
         }
@@ -39,26 +37,13 @@ private void checkAssert()
                 if (!string.IsNullOrEmpty(ExtendedDescription))
                     builder.Append($" {ExtendedDescription}");
 
-                if (getFailureMessage != null)
-                    builder.Append($": {getFailureMessage()}");
+                if (GetFailureMessage != null)
+                    builder.Append($": {GetFailureMessage()}");
 
-                throw new TracedException(builder.ToString(), CallStack);
+                throw ExceptionDispatchInfo.SetRemoteStackTrace(new AssertionException(builder.ToString()), CallStack.ToString());
             }
         }
 
         public override string ToString() => "Assert: " + base.ToString();
-
-        private class TracedException : AssertionException
-        {
-            private readonly StackTrace trace;
-
-            public TracedException(string description, StackTrace trace)
-                : base(description)
-            {
-                this.trace = trace;
-            }
-
-            public override string StackTrace => trace.ToString();
-        }
     }
 }
diff --git a/osu.Framework/Testing/Drawables/Steps/LabelStep.cs b/osu.Framework/Testing/Drawables/Steps/LabelStep.cs
index c6fcd61616..5f1271a63a 100644
--- a/osu.Framework/Testing/Drawables/Steps/LabelStep.cs
+++ b/osu.Framework/Testing/Drawables/Steps/LabelStep.cs
@@ -1,12 +1,15 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osuTK.Graphics;
 
 namespace osu.Framework.Testing.Drawables.Steps
 {
     public partial class LabelStep : StepButton
     {
+        public new required Action<LabelStep> Action { get; init; }
+
         protected override Color4 IdleColour => new Color4(77, 77, 77, 255);
 
         protected override Color4 RunningColour => new Color4(128, 128, 128, 255);
@@ -15,6 +18,9 @@ public LabelStep()
         {
             Light.Hide();
             Height = 30;
+            base.Action = clickAction;
         }
+
+        private void clickAction() => Action(this);
     }
 }
diff --git a/osu.Framework/Testing/Drawables/Steps/RepeatStepButton.cs b/osu.Framework/Testing/Drawables/Steps/RepeatStepButton.cs
index 5a386b60af..20e7aa4e1f 100644
--- a/osu.Framework/Testing/Drawables/Steps/RepeatStepButton.cs
+++ b/osu.Framework/Testing/Drawables/Steps/RepeatStepButton.cs
@@ -1,45 +1,39 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Framework.Testing.Drawables.Steps
 {
     public partial class RepeatStepButton : StepButton
     {
-        private readonly int count;
-        private int invocations;
+        public int Count { get; init; } = 1;
 
-        public override int RequiredRepetitions => count;
+        public override int RequiredRepetitions => Count;
 
-        private string text;
+        private readonly string text = string.Empty;
+        private int invocations;
 
-        public new string Text
+        public RepeatStepButton()
         {
-            get => text;
-            set => base.Text = text = value;
+            updateText();
         }
 
-        public RepeatStepButton(Action action, int count = 1, bool isSetupStep = false)
-            : base(isSetupStep)
+        public new string Text
         {
-            this.count = count;
-            Action = action;
-
-            updateText();
+            get => text;
+            init => base.Text = text = value;
         }
 
         public override void PerformStep(bool userTriggered = false)
         {
-            if (invocations == count && !userTriggered) throw new InvalidOperationException("Repeat step was invoked too many times");
+            if (invocations == Count && !userTriggered) throw new InvalidOperationException("Repeat step was invoked too many times");
 
             invocations++;
 
             base.PerformStep(userTriggered);
 
-            if (invocations >= count) // Allows for manual execution beyond the invocation limit.
+            if (invocations >= Count) // Allows for manual execution beyond the invocation limit.
                 Success();
 
             updateText();
@@ -53,7 +47,7 @@ public override void Reset()
             updateText();
         }
 
-        private void updateText() => base.Text = $@"{Text} {invocations}/{count}";
+        private void updateText() => base.Text = $@"{Text} {invocations}/{Count}";
 
         public override string ToString() => "Repeat: " + base.ToString();
     }
diff --git a/osu.Framework/Testing/Drawables/Steps/SingleStepButton.cs b/osu.Framework/Testing/Drawables/Steps/SingleStepButton.cs
index bc8806c971..203621e217 100644
--- a/osu.Framework/Testing/Drawables/Steps/SingleStepButton.cs
+++ b/osu.Framework/Testing/Drawables/Steps/SingleStepButton.cs
@@ -1,24 +1,23 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 
 namespace osu.Framework.Testing.Drawables.Steps
 {
     public partial class SingleStepButton : StepButton
     {
-        public new Action Action;
+        public new required Action Action { get; init; }
+
+        public SingleStepButton()
+        {
+            base.Action = clickAction;
+        }
 
-        public SingleStepButton(bool isSetupStep = false)
-            : base(isSetupStep)
+        private void clickAction()
         {
-            base.Action = () =>
-            {
-                Action?.Invoke();
-                Success();
-            };
+            Action();
+            Success();
         }
     }
 }
diff --git a/osu.Framework/Testing/Drawables/Steps/StepButton.cs b/osu.Framework/Testing/Drawables/Steps/StepButton.cs
index d85b9180ef..23d90f8a2a 100644
--- a/osu.Framework/Testing/Drawables/Steps/StepButton.cs
+++ b/osu.Framework/Testing/Drawables/Steps/StepButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,42 +14,20 @@ namespace osu.Framework.Testing.Drawables.Steps
 {
     public abstract partial class StepButton : CompositeDrawable
     {
-        public virtual int RequiredRepetitions => 1;
-
-        protected Box Light;
-        protected Box Background;
-        protected SpriteText SpriteText;
-
-        public Action Action { get; set; }
-
-        public LocalisableString Text
-        {
-            get => SpriteText.Text;
-            set => SpriteText.Text = value;
-        }
-
-        private Color4 lightColour = Color4.BlueViolet;
-
-        public Color4 LightColour
-        {
-            get => lightColour;
-            set
-            {
-                lightColour = value;
-                if (IsLoaded) Reset();
-            }
-        }
+        public required bool IsSetupStep { get; init; }
+        public Action? Action { get; set; }
 
-        public readonly bool IsSetupStep;
+        public virtual int RequiredRepetitions => 1;
 
         protected virtual Color4 IdleColour => new Color4(0.15f, 0.15f, 0.15f, 1);
-
         protected virtual Color4 RunningColour => new Color4(0.5f, 0.5f, 0.5f, 1);
 
-        protected StepButton(bool isSetupStep = false)
-        {
-            IsSetupStep = isSetupStep;
+        protected readonly Box Light;
+        protected readonly Box Background;
+        protected readonly SpriteText SpriteText;
 
+        protected StepButton()
+        {
             InternalChildren = new Drawable[]
             {
                 Background = new Box
@@ -85,6 +61,24 @@ protected StepButton(bool isSetupStep = false)
             Masking = true;
         }
 
+        public LocalisableString Text
+        {
+            get => SpriteText.Text;
+            set => SpriteText.Text = value;
+        }
+
+        private Color4 lightColour = Color4.BlueViolet;
+
+        public Color4 LightColour
+        {
+            get => lightColour;
+            set
+            {
+                lightColour = value;
+                if (IsLoaded) Reset();
+            }
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Framework/Testing/Drawables/Steps/ToggleStepButton.cs b/osu.Framework/Testing/Drawables/Steps/ToggleStepButton.cs
index 5d2b7d8857..41341b6f92 100644
--- a/osu.Framework/Testing/Drawables/Steps/ToggleStepButton.cs
+++ b/osu.Framework/Testing/Drawables/Steps/ToggleStepButton.cs
@@ -9,31 +9,31 @@ namespace osu.Framework.Testing.Drawables.Steps
 {
     public partial class ToggleStepButton : StepButton
     {
-        private readonly Action<bool>? reloadCallback;
         private static readonly Color4 off_colour = Color4.Red;
         private static readonly Color4 on_colour = Color4.YellowGreen;
 
-        public bool State;
+        public new required Action<bool> Action { get; init; }
 
         public override int RequiredRepetitions => 2;
 
-        public ToggleStepButton(Action<bool>? reloadCallback)
+        private bool state;
+
+        public ToggleStepButton()
         {
-            this.reloadCallback = reloadCallback;
-            Action = clickAction;
+            base.Action = clickAction;
             LightColour = off_colour;
         }
 
         private void clickAction()
         {
-            State = !State;
-            Light.FadeColour(State ? on_colour : off_colour);
-            reloadCallback?.Invoke(State);
+            state = !state;
+            Light.FadeColour(state ? on_colour : off_colour);
+            Action(state);
 
-            if (!State)
+            if (!state)
                 Success();
         }
 
-        public override string ToString() => $"Toggle: {base.ToString()} ({(State ? "on" : "off")})";
+        public override string ToString() => $"Toggle: {base.ToString()} ({(state ? "on" : "off")})";
     }
 }
diff --git a/osu.Framework/Testing/Drawables/Steps/UntilStepButton.cs b/osu.Framework/Testing/Drawables/Steps/UntilStepButton.cs
index 54656d8953..89447a9512 100644
--- a/osu.Framework/Testing/Drawables/Steps/UntilStepButton.cs
+++ b/osu.Framework/Testing/Drawables/Steps/UntilStepButton.cs
@@ -1,10 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Diagnostics;
+using System.Runtime.ExceptionServices;
 using System.Text;
 using NUnit.Framework;
 using osu.Framework.Graphics;
@@ -14,60 +13,59 @@ namespace osu.Framework.Testing.Drawables.Steps
 {
     public partial class UntilStepButton : StepButton
     {
-        private bool success;
-
-        private int invocations;
-
         private static readonly int max_attempt_milliseconds = FrameworkEnvironment.NoTestTimeout ? int.MaxValue : 10000;
 
+        public required StackTrace CallStack { get; init; }
+        public required Func<bool> Assertion { get; init; }
+        public Func<string>? GetFailureMessage { get; init; }
+        public new Action? Action { get; set; }
+
         public override int RequiredRepetitions => success ? 0 : int.MaxValue;
 
-        public new Action Action;
+        private readonly string text = string.Empty;
+        private bool success;
+        private int invocations;
+        private Stopwatch? elapsedTime;
 
-        private string text;
+        public UntilStepButton()
+        {
+            updateText();
+            LightColour = Color4.Sienna;
+            base.Action = checkAssert;
+        }
 
         public new string Text
         {
             get => text;
-            set => base.Text = text = value;
+            init => base.Text = text = value;
         }
 
-        private Stopwatch elapsedTime;
-
-        public UntilStepButton(Func<bool> waitUntilTrueDelegate, bool isSetupStep = false, Func<string> getFailureMessage = null)
-            : base(isSetupStep)
+        private void checkAssert()
         {
+            invocations++;
+            elapsedTime ??= Stopwatch.StartNew();
+
             updateText();
-            LightColour = Color4.Sienna;
 
-            base.Action = () =>
+            if (Assertion())
             {
-                invocations++;
-
-                elapsedTime ??= Stopwatch.StartNew();
-
-                updateText();
-
-                if (waitUntilTrueDelegate())
-                {
-                    elapsedTime = null;
-                    success = true;
-                    Success();
-                }
-                else if (!Debugger.IsAttached && elapsedTime.ElapsedMilliseconds >= max_attempt_milliseconds)
-                {
-                    StringBuilder builder = new StringBuilder();
+                elapsedTime = null;
+                success = true;
+                Success();
+            }
+            else if (!Debugger.IsAttached && elapsedTime.ElapsedMilliseconds >= max_attempt_milliseconds)
+            {
+                StringBuilder builder = new StringBuilder();
 
-                    builder.Append($"\"{Text}\" timed out");
+                builder.Append($"\"{Text}\" timed out");
 
-                    if (getFailureMessage != null)
-                        builder.Append($": {getFailureMessage()}");
+                if (GetFailureMessage != null)
+                    builder.Append($": {GetFailureMessage()}");
 
-                    throw new AssertionException(builder.ToString());
-                }
+                throw ExceptionDispatchInfo.SetRemoteStackTrace(new AssertionException(builder.ToString()), CallStack.ToString());
+            }
 
-                Action?.Invoke();
-            };
+            Action?.Invoke();
         }
 
         public override void Reset()
diff --git a/osu.Framework/Testing/TestBrowser.cs b/osu.Framework/Testing/TestBrowser.cs
index 3290b01e3f..8f5b708471 100644
--- a/osu.Framework/Testing/TestBrowser.cs
+++ b/osu.Framework/Testing/TestBrowser.cs
@@ -521,9 +521,10 @@ void addSetUpSteps()
 
                 if (setUpMethods.Any())
                 {
-                    CurrentTest.AddStep(new SingleStepButton(true)
+                    CurrentTest.AddStep(new SingleStepButton
                     {
                         Text = "[SetUp]",
+                        IsSetupStep = true,
                         LightColour = Color4.Teal,
                         Action = () => setUpMethods.ForEach(s => s.Invoke(CurrentTest, null))
                     });
@@ -589,7 +590,7 @@ private static IEnumerable getTestCaseSourceValue(MethodInfo testMethod, TestCas
         private void runTests(Action onCompletion)
         {
             int actualStepCount = 0;
-            CurrentTest.RunAllSteps(onCompletion, e => Logger.Log($@"Error on step: {e}"), s =>
+            CurrentTest.RunAllSteps(onCompletion, (s, e) => Logger.Error(e, $"Step {s} triggered an error"), s =>
             {
                 if (!interactive || RunAllSteps.Value)
                     return false;
diff --git a/osu.Framework/Testing/TestScene.cs b/osu.Framework/Testing/TestScene.cs
index c0dca8ec2f..545f59161e 100644
--- a/osu.Framework/Testing/TestScene.cs
+++ b/osu.Framework/Testing/TestScene.cs
@@ -204,7 +204,7 @@ protected TestScene()
         private ScheduledDelegate stepRunner;
         private readonly ScrollContainer<Drawable> scroll;
 
-        public void RunAllSteps(Action onCompletion = null, Action<Exception> onError = null, Func<StepButton, bool> stopCondition = null, StepButton startFromStep = null)
+        public void RunAllSteps(Action onCompletion = null, Action<StepButton, Exception> onError = null, Func<StepButton, bool> stopCondition = null, StepButton startFromStep = null)
         {
             // schedule once as we want to ensure we have run our LoadComplete before attempting to execute steps.
             // a user may be adding a step in LoadComplete.
@@ -222,7 +222,7 @@ public void RunAllSteps(Action onCompletion = null, Action<Exception> onError =
 
         private StepButton loadableStep => actionIndex >= 0 ? StepsContainer.Children.ElementAtOrDefault(actionIndex) as StepButton : null;
 
-        private void runNextStep(Action onCompletion, Action<Exception> onError, Func<StepButton, bool> stopCondition)
+        private void runNextStep(Action onCompletion, Action<StepButton, Exception> onError, Func<StepButton, bool> stopCondition)
         {
             try
             {
@@ -242,7 +242,7 @@ private void runNextStep(Action onCompletion, Action<Exception> onError, Func<St
                     : "💥 Failed");
 
                 LoadingComponentsLogger.LogAndFlush();
-                onError?.Invoke(e);
+                onError?.Invoke(loadableStep, e);
                 return;
             }
 
@@ -271,145 +271,164 @@ private void runNextStep(Action onCompletion, Action<Exception> onError, Func<St
                 stepRunner = Scheduler.AddDelayed(() => runNextStep(onCompletion, onError, stopCondition), TimePerAction);
         }
 
-        public void AddStep(StepButton step) => schedule(() => StepsContainer.Add(step));
-
-        private bool addStepsAsSetupSteps;
-
         public void ChangeBackgroundColour(ColourInfo colour)
             => backgroundFill.FadeColour(colour, 200, Easing.OutQuint);
 
-        public StepButton AddStep(string description, Action action)
+        private bool addStepsAsSetupSteps;
+
+        public void AddStep(StepButton step)
         {
-            var step = new SingleStepButton(addStepsAsSetupSteps)
+            schedule(() =>
             {
-                Text = description,
-                Action = action
-            };
-
-            AddStep(step);
-
-            return step;
+                StepsContainer.Add(step);
+            });
         }
 
-        public LabelStep AddLabel(string description)
+        public void AddStep([NotNull] string description, [NotNull] Action action)
         {
-            var step = new LabelStep
+            AddStep(new SingleStepButton
             {
                 Text = description,
-            };
+                Action = action,
+                IsSetupStep = addStepsAsSetupSteps
+            });
+        }
 
-            step.Action = () =>
+        public void AddLabel([NotNull] string description)
+        {
+            AddStep(new LabelStep
             {
-                Logger.Log($@"💨 {this} {description}");
-
-                // kinda hacky way to avoid this doesn't get triggered by automated runs.
-                if (step.IsHovered)
-                    RunAllSteps(startFromStep: step, stopCondition: s => s is LabelStep);
-            };
-
-            AddStep(step);
+                Text = description,
+                IsSetupStep = false,
+                Action = step =>
+                {
+                    Logger.Log($@"💨 {this} {description}");
 
-            return step;
+                    // kinda hacky way to avoid this doesn't get triggered by automated runs.
+                    if (step.IsHovered)
+                        RunAllSteps(startFromStep: step, stopCondition: s => s is LabelStep, onError: (s, e) => Logger.Error(e, $"Step {s} triggered error"));
+                },
+            });
         }
 
-        protected void AddRepeatStep(string description, Action action, int invocationCount) => schedule(() =>
+        protected void AddRepeatStep([NotNull] string description, [NotNull] Action action, int invocationCount)
         {
-            StepsContainer.Add(new RepeatStepButton(action, invocationCount, addStepsAsSetupSteps)
+            AddStep(new RepeatStepButton
             {
                 Text = description,
+                IsSetupStep = addStepsAsSetupSteps,
+                Action = action,
+                Count = invocationCount
             });
-        });
+        }
 
-        protected void AddToggleStep(string description, Action<bool> action) => schedule(() =>
+        protected void AddToggleStep([NotNull] string description, [NotNull] Action<bool> action)
         {
-            StepsContainer.Add(new ToggleStepButton(action)
+            AddStep(new ToggleStepButton
             {
-                Text = description
+                Text = description,
+                IsSetupStep = addStepsAsSetupSteps,
+                Action = action,
             });
-        });
+        }
 
-        protected void AddUntilStep(string description, Func<bool> waitUntilTrueDelegate) => schedule(() =>
+        protected void AddUntilStep([CanBeNull] string description, [NotNull] Func<bool> waitUntilTrueDelegate)
         {
-            StepsContainer.Add(new UntilStepButton(waitUntilTrueDelegate, addStepsAsSetupSteps)
+            AddStep(new UntilStepButton
             {
                 Text = description ?? @"Until",
+                IsSetupStep = addStepsAsSetupSteps,
+                CallStack = new StackTrace(1, true),
+                Assertion = waitUntilTrueDelegate,
             });
-        });
+        }
 
-        protected void AddUntilStep<T>(string description, ActualValueDelegate<T> actualValue, Func<IResolveConstraint> constraint) => schedule(() =>
+        protected void AddUntilStep<T>([CanBeNull] string description, [NotNull] ActualValueDelegate<T> actualValue, [NotNull] Func<IResolveConstraint> constraint)
         {
             ConstraintResult lastResult = null;
 
-            StepsContainer.Add(
-                new UntilStepButton(
-                    () =>
-                    {
-                        lastResult = constraint().Resolve().ApplyTo(actualValue());
-                        return lastResult.IsSuccess;
-                    },
-                    addStepsAsSetupSteps,
-                    () =>
-                    {
-                        var writer = new TextMessageWriter(string.Empty);
-                        lastResult.WriteMessageTo(writer);
-                        return writer.ToString().TrimStart();
-                    })
+            AddStep(new UntilStepButton
+            {
+                Text = description ?? @"Until",
+                IsSetupStep = addStepsAsSetupSteps,
+                CallStack = new StackTrace(1, true),
+                Assertion = () =>
                 {
-                    Text = description ?? @"Until",
-                });
-        });
+                    lastResult = constraint().Resolve().ApplyTo(actualValue());
+                    return lastResult.IsSuccess;
+                },
+                GetFailureMessage = () =>
+                {
+                    if (lastResult == null)
+                        return string.Empty;
+
+                    var writer = new TextMessageWriter(string.Empty);
+                    lastResult.WriteMessageTo(writer);
+                    return writer.ToString().TrimStart();
+                }
+            });
+        }
 
-        protected void AddWaitStep(string description, int waitCount) => schedule(() =>
+        protected void AddWaitStep([CanBeNull] string description, int waitCount)
         {
-            StepsContainer.Add(new RepeatStepButton(() => { }, waitCount, addStepsAsSetupSteps)
+            AddStep(new RepeatStepButton
             {
                 Text = description ?? @"Wait",
+                IsSetupStep = addStepsAsSetupSteps,
+                Count = waitCount
             });
-        });
+        }
 
-        protected void AddSliderStep<T>(string description, T min, T max, T start, Action<T> valueChanged) where T : struct, INumber<T>, IMinMaxValue<T> => schedule(() =>
+        protected void AddSliderStep<T>([NotNull] string description, T min, T max, T start, [NotNull] Action<T> valueChanged) where T : struct, INumber<T>, IMinMaxValue<T>
         {
-            StepsContainer.Add(new StepSlider<T>(description, min, max, start)
+            schedule(() =>
             {
-                ValueChanged = valueChanged,
+                StepsContainer.Add(new StepSlider<T>(description, min, max, start)
+                {
+                    ValueChanged = valueChanged,
+                });
             });
-        });
+        }
 
-        protected void AddAssert(string description, Func<bool> assert, string extendedDescription = null) => schedule(() =>
+        protected void AddAssert([NotNull] string description, [NotNull] Func<bool> assert, [CanBeNull] string extendedDescription = null)
         {
-            StepsContainer.Add(new AssertButton(addStepsAsSetupSteps)
+            AddStep(new AssertButton
             {
                 Text = description,
+                IsSetupStep = addStepsAsSetupSteps,
                 ExtendedDescription = extendedDescription,
-                CallStack = new StackTrace(1),
+                CallStack = new StackTrace(1, true),
                 Assertion = assert,
             });
-        });
+        }
 
-        protected void AddAssert<T>(string description, ActualValueDelegate<T> actualValue, Func<IResolveConstraint> constraint, string extendedDescription = null) => schedule(() =>
+        protected void AddAssert<T>([NotNull] string description, [NotNull] ActualValueDelegate<T> actualValue, [NotNull] Func<IResolveConstraint> constraint,
+                                    [CanBeNull] string extendedDescription = null)
         {
             ConstraintResult lastResult = null;
 
-            StepsContainer.Add(new AssertButton(addStepsAsSetupSteps, () =>
-            {
-                if (lastResult == null)
-                    return string.Empty;
-
-                var writer = new TextMessageWriter(string.Empty);
-                lastResult.WriteMessageTo(writer);
-                return writer.ToString().TrimStart();
-            })
+            AddStep(new AssertButton
             {
                 Text = description,
+                IsSetupStep = addStepsAsSetupSteps,
                 ExtendedDescription = extendedDescription,
-                CallStack = new StackTrace(1),
+                CallStack = new StackTrace(1, true),
                 Assertion = () =>
                 {
                     lastResult = constraint().Resolve().ApplyTo(actualValue());
                     return lastResult.IsSuccess;
+                },
+                GetFailureMessage = () =>
+                {
+                    if (lastResult == null)
+                        return string.Empty;
+
+                    var writer = new TextMessageWriter(string.Empty);
+                    lastResult.WriteMessageTo(writer);
+                    return writer.ToString().TrimStart();
                 }
             });
-        });
+        }
 
         internal void RunSetUpSteps()
         {
diff --git a/osu.Framework/Testing/TestSceneTestRunner.cs b/osu.Framework/Testing/TestSceneTestRunner.cs
index f4e6bf53fc..32f05b7076 100644
--- a/osu.Framework/Testing/TestSceneTestRunner.cs
+++ b/osu.Framework/Testing/TestSceneTestRunner.cs
@@ -76,7 +76,7 @@ void complete()
                     test.RunAllSteps(() =>
                     {
                         Scheduler.AddDelayed(complete, time_between_tests);
-                    }, e =>
+                    }, (_, e) =>
                     {
                         exception = ExceptionDispatchInfo.Capture(e);
                         complete();
diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
index f9b558c41b..ca76688201 100644
--- a/osu.Framework/osu.Framework.csproj
+++ b/osu.Framework/osu.Framework.csproj
@@ -23,7 +23,6 @@
     <PackageReference Include="FFmpeg.AutoGen" Version="4.3.0.1" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="5.0.11" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="NuGet.ProjectModel" Version="5.11.0" />
     <PackageReference Include="ppy.ManagedBass" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Fx" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />