diff --git a/Avalonia.Desktop.slnf b/Avalonia.Desktop.slnf
index 3fa8e969c8..2f034bd083 100644
--- a/Avalonia.Desktop.slnf
+++ b/Avalonia.Desktop.slnf
@@ -5,6 +5,7 @@
       "packages\\Avalonia\\Avalonia.csproj",
       "samples\\ControlCatalog.NetCore\\ControlCatalog.NetCore.csproj",
       "samples\\ControlCatalog\\ControlCatalog.csproj",
+      "samples\\GpuInterop\\GpuInterop.csproj",
       "samples\\IntegrationTestApp\\IntegrationTestApp.csproj",
       "samples\\MiniMvvm\\MiniMvvm.csproj",
       "samples\\SampleControls\\ControlSamples.csproj",
diff --git a/Avalonia.sln b/Avalonia.sln
index fc42a5d63b..ce9a37a3ce 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -231,6 +231,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Browser.Blaz
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUIDemo", "samples\ReactiveUIDemo\ReactiveUIDemo.csproj", "{75C47156-C5D8-44BC-A5A7-E8657C2248D6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GpuInterop", "samples\GpuInterop\GpuInterop.csproj", "{C810060E-3809-4B74-A125-F11533AF9C1B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -542,6 +544,10 @@ Global
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -606,6 +612,7 @@ Global
 		{15B93A4C-1B46-43F6-B534-7B25B6E99932} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{90B08091-9BBD-4362-B712-E9F2CC62B218} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{C810060E-3809-4B74-A125-F11533AF9C1B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
diff --git a/build/Base.props b/build/Base.props
index 26f19e3abc..c2fc11c94b 100644
--- a/build/Base.props
+++ b/build/Base.props
@@ -1,6 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition="'$(TargetFramework)' != 'net6'">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
   </ItemGroup>
diff --git a/build/SharpDX.props b/build/SharpDX.props
index 69aa817a01..ff521977fd 100644
--- a/build/SharpDX.props
+++ b/build/SharpDX.props
@@ -1,9 +1,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SharpDXPackageVersion>4.0.1</SharpDXPackageVersion>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SharpDX" Version="4.0.1" />
-    <PackageReference Include="SharpDX.Direct2D1" Version="4.0.1" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" />
-    <PackageReference Include="SharpDX.DXGI" Version="4.0.1" />
-    <PackageReference Include="SharpDX.Direct3D9" Version="4.0.1" Condition="'$(UseDirect3D9)' == 'true'" />
+    <PackageReference Include="SharpDX" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.Direct2D1" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.DXGI" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.Direct3D9" Version="$(SharpDXPackageVersion)" Condition="'$(UseDirect3D9)' == 'true'" />
+    <PackageReference Include="SharpDX.D3DCompiler" Version="$(SharpDXPackageVersion)" Condition="'$(UseD3DCompiler)' == 'true'" />
+    <PackageReference Include="SharpDX.Mathematics" Version="$(SharpDXPackageVersion)" Condition="'$(UseSharpDXMathematics)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 166b98436e..83776ec2c1 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -144,9 +144,12 @@
       <TabItem Header="RelativePanel">
         <pages:RelativePanelPage />
       </TabItem>
-        <TabItem Header="ScrollViewer">
+      <TabItem Header="ScrollViewer">
         <pages:ScrollViewerPage />
       </TabItem>
+      <TabItem Header="ScrollViewer Snapping">
+        <pages:ScrollSnapPage />
+      </TabItem>
       <TabItem Header="Slider">
         <pages:SliderPage />
       </TabItem>
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 1726028a3f..a9bf150ff9 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -60,7 +60,7 @@ namespace ControlCatalog
             {
                 if (flowDirections.SelectedItem is FlowDirection flowDirection)
                 {
-                    this.FlowDirection = flowDirection;
+                    TopLevel.GetTopLevel(this).FlowDirection = flowDirection;
                 }
             };
 
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 5325534909..90c717e7ed 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -1,6 +1,8 @@
 <UserControl x:Class="ControlCatalog.Pages.DialogsPage"
              xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+             xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections">
   <StackPanel Margin="4"
               Orientation="Vertical"
               Spacing="4">
@@ -42,6 +44,19 @@
       </StackPanel>
     </Expander>
 
+    <AutoCompleteBox x:Name="CurrentFolderBox" Watermark="Write full path/uri or well known folder name">
+      <AutoCompleteBox.Items>
+        <generic:List x:TypeArguments="storage:WellKnownFolder">
+          <storage:WellKnownFolder>Desktop</storage:WellKnownFolder>
+          <storage:WellKnownFolder>Documents</storage:WellKnownFolder>
+          <storage:WellKnownFolder>Downloads</storage:WellKnownFolder>
+          <storage:WellKnownFolder>Pictures</storage:WellKnownFolder>
+          <storage:WellKnownFolder>Videos</storage:WellKnownFolder>
+          <storage:WellKnownFolder>Music</storage:WellKnownFolder>
+        </generic:List>
+      </AutoCompleteBox.Items>
+    </AutoCompleteBox>
+    
     <TextBlock x:Name="PickerLastResultsVisible"
                Classes="h2"
                IsVisible="False"
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index 1387fc0e7b..f7b020678d 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -24,13 +24,38 @@ namespace ControlCatalog.Pages
         {
             this.InitializeComponent();
 
+            IStorageFolder? lastSelectedDirectory = null;
+            bool ignoreTextChanged = false;
+
             var results = this.Get<ItemsControl>("PickerLastResults");
             var resultsVisible = this.Get<TextBlock>("PickerLastResultsVisible");
             var bookmarkContainer = this.Get<TextBox>("BookmarkContainer");
             var openedFileContent = this.Get<TextBox>("OpenedFileContent");
             var openMultiple = this.Get<CheckBox>("OpenMultiple");
+            var currentFolderBox = this.Get<AutoCompleteBox>("CurrentFolderBox");
+
+            currentFolderBox.TextChanged += async (sender, args) =>
+            {
+                if (ignoreTextChanged) return;
+
+                if (Enum.TryParse<WellKnownFolder>(currentFolderBox.Text, true, out var folderEnum))
+                {
+                    lastSelectedDirectory = await GetStorageProvider().TryGetWellKnownFolder(folderEnum);
+                }
+                else
+                {
+                    if (!Uri.TryCreate(currentFolderBox.Text, UriKind.Absolute, out var folderLink))
+                    {
+                        Uri.TryCreate("file://" + currentFolderBox.Text, UriKind.Absolute, out folderLink);
+                    }
+
+                    if (folderLink is not null)
+                    {
+                        lastSelectedDirectory = await GetStorageProvider().TryGetFolderFromPath(folderLink);
+                    }
+                }
+            };
 
-            IStorageFolder? lastSelectedDirectory = null;
 
             List<FileDialogFilter> GetFilters()
             {
@@ -84,7 +109,7 @@ namespace ControlCatalog.Pages
                 {
                     Title = "Open multiple files",
                     Filters = GetFilters(),
-                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+                    Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
                     AllowMultiple = true
                 }.ShowAsync(GetWindow());
                 results.Items = result;
@@ -97,7 +122,7 @@ namespace ControlCatalog.Pages
                 {
                     Title = "Save file",
                     Filters = filters,
-                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+                    Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
                     DefaultExtension = filters?.Any() == true ? "txt" : null,
                     InitialFileName = "test.txt"
                 }.ShowAsync(GetWindow());
@@ -109,7 +134,7 @@ namespace ControlCatalog.Pages
                 var result = await new OpenFolderDialog()
                 {
                     Title = "Select folder",
-                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null
+                    Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
                 }.ShowAsync(GetWindow());
                 if (string.IsNullOrEmpty(result))
                 {
@@ -117,7 +142,7 @@ namespace ControlCatalog.Pages
                 }
                 else
                 {
-                    lastSelectedDirectory = new BclStorageFolder(new System.IO.DirectoryInfo(result));
+                    SetFolder(await GetStorageProvider().TryGetFolderFromPath(result));
                     results.Items = new[] { result };
                     resultsVisible.IsVisible = true;
                 }
@@ -127,7 +152,7 @@ namespace ControlCatalog.Pages
                 var result = await new OpenFileDialog()
                 {
                     Title = "Select both",
-                    Directory = lastSelectedDirectory?.TryGetUri(out var path) == true ? path.LocalPath : null,
+                    Directory = lastSelectedDirectory?.Path is {IsAbsoluteUri:true} path ? path.LocalPath : null,
                     AllowMultiple = true
                 }.ShowManagedAsync(GetWindow(), new ManagedFileDialogOptions
                 {
@@ -210,7 +235,7 @@ namespace ControlCatalog.Pages
 #endif
                     await reader.WriteLineAsync(openedFileContent.Text);
 
-                    lastSelectedDirectory = await file.GetParentAsync();
+                    SetFolder(await file.GetParentAsync());
                 }
 
                 await SetPickerResult(file is null ? null : new[] { file });
@@ -226,7 +251,7 @@ namespace ControlCatalog.Pages
 
                 await SetPickerResult(folders);
 
-                lastSelectedDirectory = folders.FirstOrDefault();
+                SetFolder(folders.FirstOrDefault());
             };
             this.Get<Button>("OpenFileFromBookmark").Click += async delegate
             {
@@ -243,10 +268,16 @@ namespace ControlCatalog.Pages
                     : null;
 
                 await SetPickerResult(folder is null ? null : new[] { folder });
-
-                lastSelectedDirectory = folder;
+                SetFolder(folder);
             };
 
+            void SetFolder(IStorageFolder? folder)
+            {
+                ignoreTextChanged = true;
+                lastSelectedDirectory = folder;
+                currentFolderBox.Text = folder?.Path.LocalPath;
+                ignoreTextChanged = false;
+            }
             async Task SetPickerResult(IReadOnlyCollection<IStorageItem>? items)
             {
                 items ??= Array.Empty<IStorageItem>();
@@ -297,10 +328,11 @@ namespace ControlCatalog.Pages
 
                     openedFileContent.Text = resultText;
 
-                    lastSelectedDirectory = await item.GetParentAsync();
-                    if (lastSelectedDirectory is not null)
+                    var parent = await item.GetParentAsync();
+                    SetFolder(parent);
+                    if (parent is not null)
                     {
-                        mappedResults.Add(FullPathOrName(lastSelectedDirectory));
+                        mappedResults.Add(FullPathOrName(parent));
                     }
 
                     foreach (var selectedItem in items)
@@ -393,7 +425,7 @@ CanPickFolder: {storageProvider.CanPickFolder}";
         private static string FullPathOrName(IStorageItem? item)
         {
             if (item is null) return "(null)";
-            return item.TryGetUri(out var uri) ? uri.ToString() : item.Name;
+            return item.Path is { IsAbsoluteUri: true } path ? path.ToString() : item.Name;
         }
 
         Window GetWindow() => TopLevel.GetTopLevel(this) as Window ?? throw new NullReferenceException("Invalid Owner");
diff --git a/samples/ControlCatalog/Pages/GesturePage.cs b/samples/ControlCatalog/Pages/GesturePage.cs
index ee10f21317..0bb8f38219 100644
--- a/samples/ControlCatalog/Pages/GesturePage.cs
+++ b/samples/ControlCatalog/Pages/GesturePage.cs
@@ -6,6 +6,7 @@ using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.Rendering.Composition;
+using Avalonia.Utilities;
 
 namespace ControlCatalog.Pages
 {
@@ -53,6 +54,7 @@ namespace ControlCatalog.Pages
                 {
                     _currentScale = 1;
                     compositionVisual.Scale = new Vector3(1,1,1);
+                    compositionVisual.Offset = default;
                     image.InvalidateMeasure();
                 }
             };
@@ -100,13 +102,19 @@ namespace ControlCatalog.Pages
             {
                 InitComposition(control!);
 
-                isZooming = true;
-
                 if(compositionVisual != null)
                 {
                     var scale = _currentScale * (float)e.Scale;
 
+                    if (scale <= 1)
+                    {
+                        scale = 1;
+                        compositionVisual.Offset = default;
+                    }
+
                     compositionVisual.Scale = new(scale, scale, 1);
+
+                    e.Handled = true;
                 }
             });
 
@@ -114,8 +122,6 @@ namespace ControlCatalog.Pages
             {
                 InitComposition(control!);
 
-                isZooming = false;
-
                 if (compositionVisual != null)
                 {
                     _currentScale = compositionVisual.Scale.X;
@@ -126,11 +132,19 @@ namespace ControlCatalog.Pages
             {
                 InitComposition(control!);
 
-                if (compositionVisual != null && !isZooming)
+                if (compositionVisual != null && _currentScale != 1)
                 {
-                    currentOffset -= new Vector3((float)e.Delta.X, (float)e.Delta.Y, 0);
+                    currentOffset += new Vector3((float)e.Delta.X, (float)e.Delta.Y, 0);
+
+                    var currentSize = control.Bounds.Size * _currentScale;
+
+                    currentOffset = new Vector3((float)MathUtilities.Clamp(currentOffset.X, 0, currentSize.Width - control.Bounds.Width),
+                        (float)MathUtilities.Clamp(currentOffset.Y, 0, currentSize.Height - control.Bounds.Height),
+                        0);
 
-                    compositionVisual.Offset = currentOffset;
+                    compositionVisual.Offset = currentOffset * -1;
+
+                    e.Handled = true;
                 }
             });
         }
@@ -173,6 +187,8 @@ namespace ControlCatalog.Pages
                 if (ballCompositionVisual != null)
                 {
                     ballCompositionVisual.Offset = defaultOffset + new System.Numerics.Vector3((float)e.Delta.X * 0.4f, (float)e.Delta.Y * 0.4f, 0) * (inverse ? -1 : 1);
+
+                    e.Handled = true;
                 }
             });
 
@@ -187,11 +203,6 @@ namespace ControlCatalog.Pages
 
             void InitComposition(Control control)
             {
-                if (ballCompositionVisual != null)
-                {
-                    return;
-                }
-
                 ballCompositionVisual = ElementComposition.GetElementVisual(ball);
 
                 if (ballCompositionVisual != null)
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index ded02330d5..c77d65ddf1 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -78,12 +78,7 @@ namespace ControlCatalog.Pages
             get => _info;
             private set => SetAndRaise(InfoProperty, ref _info, value);
         }
-
-        static OpenGlPageControl()
-        {
-            AffectsRender<OpenGlPageControl>(YawProperty, PitchProperty, RollProperty, DiscoProperty);
-        }
-
+        
         private int _vertexShader;
         private int _fragmentShader;
         private int _shaderProgram;
@@ -254,7 +249,7 @@ namespace ControlCatalog.Pages
                 Console.WriteLine(err);
         }
 
-        protected unsafe override void OnOpenGlInit(GlInterface GL, int fb)
+        protected override unsafe void OnOpenGlInit(GlInterface GL)
         {
             CheckError(GL);
 
@@ -309,7 +304,7 @@ namespace ControlCatalog.Pages
 
         }
 
-        protected override void OnOpenGlDeinit(GlInterface GL, int fb)
+        protected override void OnOpenGlDeinit(GlInterface GL)
         {
             // Unbind everything
             GL.BindBuffer(GL_ARRAY_BUFFER, 0);
@@ -366,7 +361,15 @@ namespace ControlCatalog.Pages
 
             CheckError(GL);
             if (_disco > 0.01)
-                Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+                RequestNextFrameRendering();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == YawProperty || change.Property == RollProperty || change.Property == PitchProperty ||
+                change.Property == DiscoProperty)
+                RequestNextFrameRendering();
+            base.OnPropertyChanged(change);
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index b5b80fb147..2cdd031693 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Globalization;
+using System.Linq;
+using System.Net.Http.Headers;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
@@ -12,6 +14,11 @@ namespace ControlCatalog.Pages
     public class ScreenPage : UserControl
     {
         private double _leftMost;
+        private double _topMost;
+        private IBrush _primaryBrush = SolidColorBrush.Parse("#FF0078D7");
+        private IBrush _defaultBrush = Brushes.LightGray;
+        private IPen _activePen = new Pen(Brushes.Black);
+        private IPen _defaultPen = new Pen(Brushes.DarkGray);
 
         protected override bool BypassFlowDirectionPolicies => true;
 
@@ -34,54 +41,88 @@ namespace ControlCatalog.Pages
             var screens = w.Screens.All;
             var scaling = ((IRenderRoot)w).RenderScaling;
 
-            var drawBrush = Brushes.Black;
-            Pen p = new Pen(drawBrush);
+            var activeScreen = w.Screens.ScreenFromBounds(new PixelRect(w.Position, PixelSize.FromSize(w.Bounds.Size, scaling)));
+            double maxBottom = 0;
 
-            foreach (Screen screen in screens)
+            for (int i = 0; i<screens.Count; i++ )
             {
+                var screen = screens[i];
+
                 if (screen.Bounds.X / 10f < _leftMost)
                 {
                     _leftMost = screen.Bounds.X / 10f;
                     Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
                     return;
                 }
+                if (screen.Bounds.Y / 10f < _topMost)
+                {
+                    _topMost = screen.Bounds.Y / 10f;
+                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+                    return;
+                }
+                bool primary = screen.IsPrimary;
+                bool active = screen.Equals(activeScreen);
 
-                Rect boundsRect = new Rect(screen.Bounds.X / 10f + Math.Abs(_leftMost), screen.Bounds.Y / 10f, screen.Bounds.Width / 10f,
+                Rect boundsRect = new Rect(screen.Bounds.X / 10f + Math.Abs(_leftMost), screen.Bounds.Y / 10f+Math.Abs(_topMost), screen.Bounds.Width / 10f,
                                   screen.Bounds.Height / 10f);
-                Rect workingAreaRect = new Rect(screen.WorkingArea.X / 10f + Math.Abs(_leftMost), screen.WorkingArea.Y / 10f, screen.WorkingArea.Width / 10f,
+                Rect workingAreaRect = new Rect(screen.WorkingArea.X / 10f + Math.Abs(_leftMost), screen.WorkingArea.Y / 10f+Math.Abs(_topMost), screen.WorkingArea.Width / 10f,
                                    screen.WorkingArea.Height / 10f);
 
-                context.DrawRectangle(p, boundsRect);
-                context.DrawRectangle(p, workingAreaRect);
+                context.DrawRectangle(primary ? _primaryBrush : _defaultBrush, active ? _activePen : _defaultPen, boundsRect);
+                context.DrawRectangle(primary ? _primaryBrush : _defaultBrush, active ? _activePen : _defaultPen, workingAreaRect);
+
+                var identifier = CreateScreenIdentifier((i+1).ToString(), primary);
+                var center = boundsRect.Center - new Point(identifier.Width / 2.0f, identifier.Height / 2.0f);
 
+                context.DrawText(identifier, center);
+                maxBottom = Math.Max(maxBottom, boundsRect.Bottom);
+            }
 
-                var formattedText = CreateFormattedText($"Bounds: {screen.Bounds.Width}:{screen.Bounds.Height}");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height));
+            double currentHeight = maxBottom;
 
-                formattedText =
-                    CreateFormattedText($"WorkArea: {screen.WorkingArea.Width}:{screen.WorkingArea.Height}");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 20));
+            for(int i = 0; i< screens.Count; i++)
+            {
+                var screen = screens[i];
+
+                var formattedText = CreateFormattedText($"Screen {i+1}", 18);
+                context.DrawText(formattedText, new Point(0, currentHeight));
+                currentHeight += 25;
+
+                formattedText = CreateFormattedText($"Bounds: {screen.Bounds.Width}:{screen.Bounds.Height}");
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
+
+                formattedText = CreateFormattedText($"WorkArea: {screen.WorkingArea.Width}:{screen.WorkingArea.Height}");
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
 
                 formattedText = CreateFormattedText($"Scaling: {screen.Scaling * 100}%");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 40));
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
 
                 formattedText = CreateFormattedText($"IsPrimary: {screen.IsPrimary}");
 
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 60));
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
+
+                formattedText = CreateFormattedText( $"Current: {screen.Equals(activeScreen)}");
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 30;
 
-                formattedText =
-                    CreateFormattedText(
-                        $"Current: {screen.Equals(w.Screens.ScreenFromBounds(new PixelRect(w.Position, PixelSize.FromSize(w.Bounds.Size, scaling))))}");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 80));
             }
 
-            context.DrawRectangle(p, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f, w.Bounds.Width / 10, w.Bounds.Height / 10));
+            context.DrawRectangle(_activePen, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f+Math.Abs(_topMost), w.Bounds.Width / 10, w.Bounds.Height / 10));
         }
 
-        private static FormattedText CreateFormattedText(string textToFormat)
+        private static FormattedText CreateFormattedText(string textToFormat, double size = 12)
         {
             return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-                Typeface.Default, 12, Brushes.Green);
+                Typeface.Default, size, Brushes.Green);
+        }
+
+        private static FormattedText CreateScreenIdentifier(string textToFormat, bool primary)
+        {
+            return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, Typeface.Default, 20, primary ? Brushes.White : Brushes.Black);
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/ScrollSnapPage.xaml b/samples/ControlCatalog/Pages/ScrollSnapPage.xaml
new file mode 100644
index 0000000000..e7e1060f31
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ScrollSnapPage.xaml
@@ -0,0 +1,222 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             d:DesignHeight="800"
+             d:DesignWidth="400"
+             x:Class="ControlCatalog.Pages.ScrollSnapPage"
+             xmlns:pages="using:ControlCatalog.Pages"
+             x:DataType="pages:ScrollSnapPageViewModel">
+  <StackPanel Orientation="Vertical" Spacing="4">
+    <TextBlock TextWrapping="Wrap"
+               Classes="h2">Scrollviewer can snap supported content both vertically and horizontally. Snapping occurs from scrolling with touch or pen, or using the pointer wheel.</TextBlock>
+
+    <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto">
+      <StackPanel Orientation="Horizontal"
+                  Spacing="4">
+        <StackPanel Orientation="Vertical"
+                    Spacing="4">
+          <TextBlock Text="Snap Point Type" />
+          <ComboBox Items="{Binding AvailableSnapPointsType}"
+                    SelectedItem="{Binding SnapPointsType}" />
+        </StackPanel>
+
+        <StackPanel Orientation="Vertical"
+                    Spacing="4">
+          <TextBlock Text="Snap Point Alignment" />
+          <ComboBox Items="{Binding AvailableSnapPointsAlignment}"
+                    SelectedItem="{Binding SnapPointsAlignment}" />
+        </StackPanel>
+
+        <ToggleSwitch IsChecked="{Binding AreSnapPointsRegular}"
+                      OffContent="No"
+                      OnContent="Yes"
+                      Content="Are Snap Points regular?" />
+      </StackPanel>
+      <TextBlock TextWrapping="Wrap"
+                 Grid.Row="1"
+                 Margin="0,10"
+                 Classes="h2">Vertical Snapping</TextBlock>
+
+      <Border
+        BorderBrush="Green"
+        BorderThickness="1"
+        Padding="0"
+        Grid.Row="2"
+        Margin="10, 5">
+        <ScrollViewer x:Name="VerticalSnapsScrollViewer"
+                      VerticalSnapPointsType="{Binding SnapPointsType}"
+                      VerticalSnapPointsAlignment="{Binding SnapPointsAlignment}"
+                      HorizontalAlignment="Stretch"
+                      Height="350"
+                      HorizontalScrollBarVisibility="Disabled">
+          <StackPanel AreVerticalSnapPointsRegular="{Binding AreSnapPointsRegular}"
+                      Orientation="Vertical"
+                      HorizontalAlignment="Stretch">
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 1"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 2"/>
+            </Border>
+            <Border Padding="5, 20"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 3"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 4"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 5"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 6"/>
+            </Border>
+            <Border Padding="5,8"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 7"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 8"/>
+            </Border>
+            <Border Padding="5,4"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 9"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 20"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 11"/>
+            </Border>
+            <Border Padding="5, 30"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         Text="Child 12"/>
+            </Border>
+          </StackPanel>
+        </ScrollViewer>
+      </Border>
+      <TextBlock TextWrapping="Wrap"
+                 Grid.Row="3"
+                 Margin="0,10"
+                 Classes="h2">Horizontal Snapping</TextBlock>
+      <Border
+        BorderBrush="Green"
+        BorderThickness="1"
+        Padding="0"
+        Grid.Row="4"
+        Margin="10, 10">
+        <ScrollViewer x:Name="HorizontalSnapsScrollViewer"
+                      HorizontalSnapPointsType="{Binding SnapPointsType}"
+                      HorizontalSnapPointsAlignment="{Binding SnapPointsAlignment}"
+                      HorizontalAlignment="Stretch"
+                      Height="350"
+                      HorizontalScrollBarVisibility="Auto"
+                      VerticalScrollBarVisibility="Disabled">
+          <StackPanel AreHorizontalSnapPointsRegular="{Binding AreSnapPointsRegular}"
+                      Orientation="Horizontal"
+                      HorizontalAlignment="Stretch">
+            <Border Padding="5, 30"
+                    Width="300"
+                    BorderBrush="Red"
+                    HorizontalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         VerticalAlignment="Center"
+                         Text="Child 1"/>
+            </Border>
+            <Border Padding="5, 30"
+                    Width="300"
+                    BorderBrush="Red"
+                    VerticalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         VerticalAlignment="Center"
+                         Text="Child 2"/>
+            </Border>
+            <Border Padding="5, 20"
+                    Width="300"
+                    BorderBrush="Red"
+                    VerticalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         VerticalAlignment="Center"
+                         Text="Child 3"/>
+            </Border>
+            <Border Padding="5, 30"
+                    Width="300"
+                    BorderBrush="Red"
+                    VerticalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         VerticalAlignment="Center"
+                         Text="Child 4"/>
+            </Border>
+            <Border Padding="5, 30"
+                    Width="300"
+                    BorderBrush="Red"
+                    VerticalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         VerticalAlignment="Center"
+                         Text="Child 5"/>
+            </Border>
+            <Border Padding="5, 30"
+                    Width="300"
+                    BorderBrush="Red"
+                    VerticalAlignment="Stretch"
+                    BorderThickness="1">
+              <TextBlock FontWeight="Bold"
+                         VerticalAlignment="Center"
+                         Text="Child 6"/>
+            </Border>
+            
+          </StackPanel>
+        </ScrollViewer>
+      </Border>
+    </Grid>
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ScrollSnapPage.xaml.cs b/samples/ControlCatalog/Pages/ScrollSnapPage.xaml.cs
new file mode 100644
index 0000000000..384dc67c66
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ScrollSnapPage.xaml.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
+using MiniMvvm;
+
+namespace ControlCatalog.Pages
+{
+    public class ScrollSnapPageViewModel : ViewModelBase
+    {
+        private SnapPointsType _snapPointsType;
+        private SnapPointsAlignment _snapPointsAlignment;
+        private bool _areSnapPointsRegular;
+
+        public ScrollSnapPageViewModel()
+        {
+
+            AvailableSnapPointsType = new List<SnapPointsType>()
+            {
+                SnapPointsType.None,
+                SnapPointsType.Mandatory,
+                SnapPointsType.MandatorySingle
+            };
+
+            AvailableSnapPointsAlignment = new List<SnapPointsAlignment>()
+            {
+                SnapPointsAlignment.Near,
+                SnapPointsAlignment.Center,
+                SnapPointsAlignment.Far,
+            };
+        }
+
+        public bool AreSnapPointsRegular
+        {
+            get => _areSnapPointsRegular;
+            set => this.RaiseAndSetIfChanged(ref _areSnapPointsRegular, value);
+        }
+
+        public SnapPointsType SnapPointsType
+        {
+            get => _snapPointsType;
+            set => this.RaiseAndSetIfChanged(ref _snapPointsType, value);
+        }
+
+        public SnapPointsAlignment SnapPointsAlignment
+        {
+            get => _snapPointsAlignment;
+            set => this.RaiseAndSetIfChanged(ref _snapPointsAlignment, value);
+        }
+        public List<SnapPointsType> AvailableSnapPointsType { get; }
+        public List<SnapPointsAlignment> AvailableSnapPointsAlignment { get; }
+    }
+
+    public class ScrollSnapPage : UserControl
+    {
+        public ScrollSnapPage()
+        {
+            this.InitializeComponent();
+
+            DataContext = new ScrollSnapPageViewModel();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
index 1903e50ed7..fa8714959b 100644
--- a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
@@ -3,12 +3,13 @@
              xmlns:pages="using:ControlCatalog.Pages"
              x:Class="ControlCatalog.Pages.ScrollViewerPage"
              x:DataType="pages:ScrollViewerPageViewModel">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h2">Allows for horizontal and vertical content scrolling.</TextBlock>
+  <StackPanel Orientation="Vertical" Spacing="20">
+    <TextBlock TextWrapping="Wrap" Classes="h2">Allows for horizontal and vertical content scrolling. Supports snapping on touch and pointer wheel scrolling.</TextBlock>
 
     <Grid ColumnDefinitions="Auto, *">
       <StackPanel Orientation="Vertical" Spacing="4">
         <ToggleSwitch IsChecked="{Binding AllowAutoHide}" Content="Allow auto hide" />
+        <ToggleSwitch IsChecked="{Binding EnableInertia}" Content="Enable Inertia" />
 
         <StackPanel Orientation="Vertical" Spacing="4">
           <TextBlock Text="Horizontal Scroll" />
@@ -24,6 +25,7 @@
       <ScrollViewer x:Name="ScrollViewer"
                     Grid.Column="1"
                     Width="400" Height="400"
+                    IsScrollInertiaEnabled="{Binding EnableInertia}"
                     AllowAutoHide="{Binding AllowAutoHide}"
                     HorizontalScrollBarVisibility="{Binding HorizontalScrollVisibility}"
                     VerticalScrollBarVisibility="{Binding VerticalScrollVisibility}">
@@ -31,6 +33,5 @@
                Source="/Assets/delicate-arch-896885_640.jpg" />
       </ScrollViewer>
     </Grid>
-
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
index dcd7a88a56..a097f1f951 100644
--- a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
@@ -9,6 +9,7 @@ namespace ControlCatalog.Pages
     public class ScrollViewerPageViewModel : ViewModelBase
     {
         private bool _allowAutoHide;
+        private bool _enableInertia;
         private ScrollBarVisibility _horizontalScrollVisibility;
         private ScrollBarVisibility _verticalScrollVisibility;
 
@@ -25,6 +26,7 @@ namespace ControlCatalog.Pages
             HorizontalScrollVisibility = ScrollBarVisibility.Auto;
             VerticalScrollVisibility = ScrollBarVisibility.Auto;
             AllowAutoHide = true;
+            EnableInertia = true;
         }
 
         public bool AllowAutoHide
@@ -33,6 +35,12 @@ namespace ControlCatalog.Pages
             set => this.RaiseAndSetIfChanged(ref _allowAutoHide, value);
         }
 
+        public bool EnableInertia
+        {
+            get => _enableInertia;
+            set => this.RaiseAndSetIfChanged(ref _enableInertia, value);
+        }
+
         public ScrollBarVisibility HorizontalScrollVisibility
         {
             get => _horizontalScrollVisibility;
diff --git a/samples/GpuInterop/App.axaml b/samples/GpuInterop/App.axaml
new file mode 100644
index 0000000000..6b18dbe520
--- /dev/null
+++ b/samples/GpuInterop/App.axaml
@@ -0,0 +1,8 @@
+<Application
+    xmlns="https://github.com/avaloniaui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:Class="GpuInterop.App">
+    <Application.Styles>
+        <FluentTheme />
+    </Application.Styles>
+</Application>
diff --git a/samples/GpuInterop/App.axaml.cs b/samples/GpuInterop/App.axaml.cs
new file mode 100644
index 0000000000..85973d59bb
--- /dev/null
+++ b/samples/GpuInterop/App.axaml.cs
@@ -0,0 +1,22 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace GpuInterop
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+            {
+                desktopLifetime.MainWindow = new MainWindow();
+            }
+        }
+    }
+}
diff --git a/samples/GpuInterop/D3DDemo/D3D11DemoControl.cs b/samples/GpuInterop/D3DDemo/D3D11DemoControl.cs
new file mode 100644
index 0000000000..c7ee2bb9a4
--- /dev/null
+++ b/samples/GpuInterop/D3DDemo/D3D11DemoControl.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using SharpDX;
+using SharpDX.Direct2D1;
+using SharpDX.Direct3D11;
+using SharpDX.DXGI;
+using SharpDX.Mathematics.Interop;
+using Buffer = SharpDX.Direct3D11.Buffer;
+using DeviceContext = SharpDX.Direct2D1.DeviceContext;
+using DxgiFactory1 = SharpDX.DXGI.Factory1;
+using Matrix = SharpDX.Matrix;
+using D3DDevice = SharpDX.Direct3D11.Device;
+using DxgiResource = SharpDX.DXGI.Resource;
+using FeatureLevel = SharpDX.Direct3D.FeatureLevel;
+using Vector3 = SharpDX.Vector3;
+
+namespace GpuInterop.D3DDemo;
+
+public class D3D11DemoControl : DrawingSurfaceDemoBase
+{
+    private D3DDevice _device;
+    private D3D11Swapchain _swapchain;
+    private SharpDX.Direct3D11.DeviceContext _context;
+    private Matrix _view;
+    private PixelSize _lastSize;
+    private Texture2D _depthBuffer;
+    private DepthStencilView _depthView;
+    private Matrix _proj;
+    private Buffer _constantBuffer;
+    private Stopwatch _st = Stopwatch.StartNew();
+
+    protected override (bool success, string info) InitializeGraphicsResources(Compositor compositor,
+        CompositionDrawingSurface surface, ICompositionGpuInterop interop)
+    {
+        if (interop?.SupportedImageHandleTypes.Contains(KnownPlatformGraphicsExternalImageHandleTypes
+                .D3D11TextureGlobalSharedHandle) != true)
+            return (false, "DXGI shared handle import is not supported by the current graphics backend");
+        
+        var factory = new DxgiFactory1();
+        using var adapter = factory.GetAdapter1(0);
+        _device = new D3DDevice(adapter, DeviceCreationFlags.None, new[]
+        {
+            FeatureLevel.Level_12_1,
+            FeatureLevel.Level_12_0,
+            FeatureLevel.Level_11_1,
+            FeatureLevel.Level_11_0,
+            FeatureLevel.Level_10_0,
+            FeatureLevel.Level_9_3,
+            FeatureLevel.Level_9_2,
+            FeatureLevel.Level_9_1,
+        });
+        _swapchain = new D3D11Swapchain(_device, interop, surface);
+        _context = _device.ImmediateContext;
+        _constantBuffer = D3DContent.CreateMesh(_device);
+        _view = Matrix.LookAtLH(new Vector3(0, 0, -5), new Vector3(0, 0, 0), Vector3.UnitY);
+        return (true, $"D3D11 ({_device.FeatureLevel}) {adapter.Description1.Description}");
+    }
+
+    protected override void FreeGraphicsResources()
+    {
+        _swapchain.DisposeAsync();
+        _swapchain = null!;
+        Utilities.Dispose(ref _depthView);
+        Utilities.Dispose(ref _depthBuffer);
+        Utilities.Dispose(ref _constantBuffer);
+        Utilities.Dispose(ref _context);
+        Utilities.Dispose(ref _device);
+    }
+
+    protected override bool SupportsDisco => true;
+
+    protected override void RenderFrame(PixelSize pixelSize)
+    {
+        if (pixelSize == default)
+            return;
+        if (pixelSize != _lastSize)
+            Resize(pixelSize);
+        using (_swapchain.BeginDraw(pixelSize, out var renderView))
+        {
+            
+            _device.ImmediateContext.OutputMerger.SetTargets(_depthView, renderView);
+            var viewProj = Matrix.Multiply(_view, _proj);
+            var context = _device.ImmediateContext;
+
+            var now = _st.Elapsed.TotalSeconds * 5;
+            var scaleX = (float)(1f + Disco * (Math.Sin(now) + 1) / 6);
+            var scaleY = (float)(1f + Disco * (Math.Cos(now) + 1) / 8);
+            var colorOff =(float) (Math.Sin(now) + 1) / 2 * Disco;
+            
+            
+            // Clear views
+            context.ClearDepthStencilView(_depthView, DepthStencilClearFlags.Depth, 1.0f, 0);
+            context.ClearRenderTargetView(renderView,
+                new RawColor4(1 - colorOff, colorOff, (float)0.5 + colorOff / 2, 1));
+
+            
+            var ypr = Matrix4x4.CreateFromYawPitchRoll(Yaw, Pitch, Roll);
+            // Update WorldViewProj Matrix
+            var worldViewProj = Matrix.RotationX((float)Yaw) * Matrix.RotationY((float)Pitch)
+                                                                          * Matrix.RotationZ((float)Roll)
+                                                                          * Matrix.Scaling(new Vector3(scaleX, scaleY, 1))
+                                                                          * viewProj;
+            worldViewProj.Transpose();
+            context.UpdateSubresource(ref worldViewProj, _constantBuffer);
+
+            // Draw the cube
+            context.Draw(36, 0);
+            
+            
+            _context.Flush();
+        }
+    }
+
+    private void Resize(PixelSize size)
+    {
+        Utilities.Dispose(ref _depthBuffer);
+        _depthBuffer = new Texture2D(_device,
+            new Texture2DDescription()
+            {
+                Format = Format.D32_Float_S8X24_UInt,
+                ArraySize = 1,
+                MipLevels = 1,
+                Width = (int)size.Width,
+                Height = (int)size.Height,
+                SampleDescription = new SampleDescription(1, 0),
+                Usage = ResourceUsage.Default,
+                BindFlags = BindFlags.DepthStencil,
+                CpuAccessFlags = CpuAccessFlags.None,
+                OptionFlags = ResourceOptionFlags.None
+            });
+
+        Utilities.Dispose(ref _depthView);
+        _depthView = new DepthStencilView(_device, _depthBuffer);
+
+        // Setup targets and viewport for rendering
+        _device.ImmediateContext.Rasterizer.SetViewport(new Viewport(0, 0, (int)size.Width, (int)size.Height, 0.0f, 1.0f));
+        
+        // Setup new projection matrix with correct aspect ratio
+        _proj = Matrix.PerspectiveFovLH((float)Math.PI / 4.0f, (float)(size.Width / size.Height), 0.1f, 100.0f);
+    }
+}
diff --git a/samples/GpuInterop/D3DDemo/D3D11Swapchain.cs b/samples/GpuInterop/D3DDemo/D3D11Swapchain.cs
new file mode 100644
index 0000000000..d2cf43ac74
--- /dev/null
+++ b/samples/GpuInterop/D3DDemo/D3D11Swapchain.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using SharpDX.Direct3D11;
+using SharpDX.DXGI;
+using DxgiFactory1 = SharpDX.DXGI.Factory1;
+using D3DDevice = SharpDX.Direct3D11.Device;
+using DxgiResource = SharpDX.DXGI.Resource;
+
+namespace GpuInterop.D3DDemo;
+
+class D3D11Swapchain : SwapchainBase<D3D11SwapchainImage>
+{
+    private readonly D3DDevice _device;
+
+    public D3D11Swapchain(D3DDevice device, ICompositionGpuInterop interop, CompositionDrawingSurface target)
+        : base(interop, target)
+    {
+        _device = device;
+    }
+
+    protected override D3D11SwapchainImage CreateImage(PixelSize size) => new(_device, size, Interop, Target);
+
+    public IDisposable BeginDraw(PixelSize size, out RenderTargetView view)
+    {
+        var rv = BeginDrawCore(size, out var image);
+        view = image.RenderTargetView;
+        return rv;
+    }
+}
+
+public class D3D11SwapchainImage : ISwapchainImage
+{
+    public PixelSize Size { get; }
+    private readonly ICompositionGpuInterop _interop;
+    private readonly CompositionDrawingSurface _target;
+    private readonly Texture2D _texture;
+    private readonly KeyedMutex _mutex;
+    private readonly IntPtr _handle;
+    private PlatformGraphicsExternalImageProperties _properties;
+    private ICompositionImportedGpuImage? _imported;
+    public Task? LastPresent { get; private set; }
+    public RenderTargetView RenderTargetView { get; }
+
+    public D3D11SwapchainImage(D3DDevice device, PixelSize size,
+        ICompositionGpuInterop interop,
+        CompositionDrawingSurface target)
+    {
+        Size = size;
+        _interop = interop;
+        _target = target;
+        _texture = new Texture2D(device,
+            new Texture2DDescription
+            {
+                Format = Format.R8G8B8A8_UNorm,
+                Width = size.Width,
+                Height = size.Height,
+                ArraySize = 1,
+                MipLevels = 1,
+                SampleDescription = new SampleDescription { Count = 1, Quality = 0 },
+                CpuAccessFlags = default,
+                OptionFlags = ResourceOptionFlags.SharedKeyedmutex,
+                BindFlags = BindFlags.RenderTarget | BindFlags.ShaderResource
+            });
+        _mutex = _texture.QueryInterface<KeyedMutex>();
+        using (var res = _texture.QueryInterface<DxgiResource>())
+            _handle = res.SharedHandle;
+        _properties = new PlatformGraphicsExternalImageProperties
+        {
+            Width = size.Width, Height = size.Height, Format = PlatformGraphicsExternalImageFormat.B8G8R8A8UNorm
+        };
+
+        RenderTargetView = new RenderTargetView(device, _texture);
+    }
+
+    public void BeginDraw()
+    {
+        _mutex.Acquire(0, int.MaxValue);
+    }
+
+    public void Present()
+    {
+        _mutex.Release(1);
+        _imported ??= _interop.ImportImage(
+            new PlatformHandle(_handle, KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle),
+            _properties);
+        LastPresent = _target.UpdateWithKeyedMutexAsync(_imported, 1, 0);
+    }
+
+
+    public async ValueTask DisposeAsync()
+    {
+        if (LastPresent != null)
+            try
+            {
+                await LastPresent;
+            }
+            catch
+            {
+                // Ignore
+            }
+
+        RenderTargetView.Dispose();
+        _mutex.Dispose();
+        _texture.Dispose();
+    }
+}
\ No newline at end of file
diff --git a/samples/GpuInterop/D3DDemo/D3DContent.cs b/samples/GpuInterop/D3DDemo/D3DContent.cs
new file mode 100644
index 0000000000..f670a9a8c9
--- /dev/null
+++ b/samples/GpuInterop/D3DDemo/D3DContent.cs
@@ -0,0 +1,110 @@
+using SharpDX;
+using SharpDX.D3DCompiler;
+using SharpDX.Direct3D;
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using SharpDX.Direct2D1;
+using SharpDX.Direct3D11;
+using SharpDX.DXGI;
+using SharpDX.Mathematics.Interop;
+using Buffer = SharpDX.Direct3D11.Buffer;
+using DeviceContext = SharpDX.Direct2D1.DeviceContext;
+using DxgiFactory1 = SharpDX.DXGI.Factory1;
+using Matrix = SharpDX.Matrix;
+using D3DDevice = SharpDX.Direct3D11.Device;
+using DxgiResource = SharpDX.DXGI.Resource;
+using FeatureLevel = SharpDX.Direct3D.FeatureLevel;
+using InputElement = SharpDX.Direct3D11.InputElement;
+
+
+namespace GpuInterop.D3DDemo;
+
+public class D3DContent
+{
+
+    public static Buffer CreateMesh(D3DDevice device)
+    {
+        // Compile Vertex and Pixel shaders
+        var vertexShaderByteCode = ShaderBytecode.CompileFromFile("D3DDemo\\MiniCube.fx", "VS", "vs_4_0");
+        var vertexShader = new VertexShader(device, vertexShaderByteCode);
+
+        var pixelShaderByteCode = ShaderBytecode.CompileFromFile("D3DDemo\\MiniCube.fx", "PS", "ps_4_0");
+        var pixelShader = new PixelShader(device, pixelShaderByteCode);
+
+        var signature = ShaderSignature.GetInputSignature(vertexShaderByteCode);
+
+        var inputElements = new[]
+        {
+            new InputElement("POSITION", 0, Format.R32G32B32A32_Float, 0, 0),
+            new InputElement("COLOR", 0, Format.R32G32B32A32_Float, 16, 0)
+        };
+
+        // Layout from VertexShader input signature
+        var layout = new InputLayout(
+            device,
+            signature,
+            inputElements);
+
+        // Instantiate Vertex buffer from vertex data
+        using var vertices = Buffer.Create(
+            device,
+            BindFlags.VertexBuffer,
+            new[]
+            {
+                new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f), // Front
+                new Vector4(-1.0f, 1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f), // BACK
+                new Vector4(1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, 1.0f, -1.0f, 1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f), // Top
+                new Vector4(-1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(-1.0f, 1.0f, -1.0f, 1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, -1.0f, 1.0f), new Vector4(0.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f), // Bottom
+                new Vector4(1.0f, -1.0f, 1.0f, 1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, 1.0f, 1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, 1.0f, 1.0f), new Vector4(1.0f, 1.0f, 0.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f), // Left
+                new Vector4(-1.0f, -1.0f, 1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(-1.0f, 1.0f, 1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(-1.0f, -1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(-1.0f, 1.0f, 1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(-1.0f, 1.0f, -1.0f, 1.0f), new Vector4(1.0f, 0.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f), // Right
+                new Vector4(1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, -1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, -1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+                new Vector4(1.0f, 1.0f, 1.0f, 1.0f), new Vector4(0.0f, 1.0f, 1.0f, 1.0f),
+            });
+
+        // Create Constant Buffer
+        var constantBuffer = new Buffer(device, Utilities.SizeOf<Matrix>(), ResourceUsage.Default,
+            BindFlags.ConstantBuffer, CpuAccessFlags.None, ResourceOptionFlags.None, 0);
+
+        var context = device.ImmediateContext;
+
+        // Prepare All the stages
+        context.InputAssembler.InputLayout = layout;
+        context.InputAssembler.PrimitiveTopology = PrimitiveTopology.TriangleList;
+        context.InputAssembler.SetVertexBuffers(0,
+            new VertexBufferBinding(vertices, Utilities.SizeOf<Vector4>() * 2, 0));
+        context.VertexShader.SetConstantBuffer(0, constantBuffer);
+        context.VertexShader.Set(vertexShader);
+        context.PixelShader.Set(pixelShader);
+        return constantBuffer;
+    }
+}
diff --git a/samples/GpuInterop/D3DDemo/MiniCube.fx b/samples/GpuInterop/D3DDemo/MiniCube.fx
new file mode 100644
index 0000000000..c6064ea56c
--- /dev/null
+++ b/samples/GpuInterop/D3DDemo/MiniCube.fx
@@ -0,0 +1,47 @@
+// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+struct VS_IN
+{
+	float4 pos : POSITION;
+	float4 col : COLOR;
+};
+
+struct PS_IN
+{
+	float4 pos : SV_POSITION;
+	float4 col : COLOR;
+};
+
+float4x4 worldViewProj;
+
+PS_IN VS( VS_IN input )
+{
+	PS_IN output = (PS_IN)0;
+	
+	output.pos = mul(input.pos, worldViewProj);
+	output.col = input.col;
+	
+	return output;
+}
+
+float4 PS( PS_IN input ) : SV_Target
+{
+	return input.col;
+}
diff --git a/samples/GpuInterop/DrawingSurfaceDemoBase.cs b/samples/GpuInterop/DrawingSurfaceDemoBase.cs
new file mode 100644
index 0000000000..aad813ea82
--- /dev/null
+++ b/samples/GpuInterop/DrawingSurfaceDemoBase.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Numerics;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Rendering.Composition;
+using Avalonia.VisualTree;
+
+namespace GpuInterop;
+
+public abstract class DrawingSurfaceDemoBase : Control, IGpuDemo
+{
+    private CompositionSurfaceVisual? _visual;
+    private Compositor? _compositor;
+    private Action _update;
+    private string _info;
+    private bool _updateQueued;
+    private bool _initialized;
+    
+    protected CompositionDrawingSurface Surface { get; private set; }
+
+    public DrawingSurfaceDemoBase()
+    {
+        _update = UpdateFrame;
+    }
+    
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        Initialize();
+    }
+
+    protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        if (_initialized)
+            FreeGraphicsResources();
+        _initialized = false;
+        base.OnDetachedFromLogicalTree(e);
+    }
+
+    async void Initialize()
+    {
+        try
+        {
+            var selfVisual = ElementComposition.GetElementVisual(this)!;
+            _compositor = selfVisual.Compositor;
+            
+            Surface = _compositor.CreateDrawingSurface();
+            _visual = _compositor.CreateSurfaceVisual();
+            _visual.Size = new Vector2((float)Bounds.Width, (float)Bounds.Height);
+            _visual.Surface = Surface;
+            ElementComposition.SetElementChildVisual(this, _visual);
+            var (res, info) = await DoInitialize(_compositor, Surface);
+            _info = info;
+            if (ParentControl != null)
+                ParentControl.Info = info;
+            _initialized = res;
+            QueueNextFrame();
+        }
+        catch (Exception e)
+        {
+            if (ParentControl != null)
+                ParentControl.Info = e.ToString();
+        }
+    }
+
+    void UpdateFrame()
+    {
+        _updateQueued = false;
+        var root = this.GetVisualRoot();
+        if (root == null)
+            return;
+        
+        _visual!.Size = new Vector2((float)Bounds.Width, (float)Bounds.Height);
+        var size = PixelSize.FromSize(Bounds.Size, root.RenderScaling);
+        RenderFrame(size);
+        if (SupportsDisco && Disco > 0)
+            QueueNextFrame();
+    }
+    
+    void QueueNextFrame()
+    {
+        if (_initialized && !_updateQueued && _compositor != null)
+        {
+            _updateQueued = true;
+            _compositor?.RequestCompositionUpdate(_update);
+        }
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        if(change.Property == BoundsProperty)
+            QueueNextFrame();
+        base.OnPropertyChanged(change);
+    }
+
+    async Task<(bool success, string info)> DoInitialize(Compositor compositor,
+        CompositionDrawingSurface compositionDrawingSurface)
+    {
+        var interop = await compositor.TryGetCompositionGpuInterop();
+        if (interop == null)
+            return (false, "Compositor doesn't support interop for the current backend");
+        return InitializeGraphicsResources(compositor, compositionDrawingSurface, interop);
+    }
+    
+    protected abstract (bool success, string info) InitializeGraphicsResources(Compositor compositor,
+        CompositionDrawingSurface compositionDrawingSurface, ICompositionGpuInterop gpuInterop);
+
+    protected abstract void FreeGraphicsResources();
+    
+
+    protected abstract void RenderFrame(PixelSize pixelSize);
+    protected virtual bool SupportsDisco => false;
+
+    public void Update(GpuDemo parent, float yaw, float pitch, float roll, float disco)
+    {
+        ParentControl = parent;
+        if (ParentControl != null)
+        {
+            ParentControl.Info = _info;
+            ParentControl.DiscoVisible = true;
+        }
+
+        Yaw = yaw;
+        Pitch = pitch;
+        Roll = roll;
+        Disco = disco;
+        QueueNextFrame();
+    }
+
+    public GpuDemo? ParentControl { get; private set; }
+
+    public float Disco { get; private set; }
+
+    public float Roll { get; private set; }
+
+    public float Pitch { get; private set; }
+
+    public float Yaw { get; private set; }
+}
diff --git a/samples/GpuInterop/GpuDemo.axaml b/samples/GpuInterop/GpuDemo.axaml
new file mode 100644
index 0000000000..6ca51abadb
--- /dev/null
+++ b/samples/GpuInterop/GpuDemo.axaml
@@ -0,0 +1,32 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="GpuInterop.GpuDemo"
+             xmlns:local="clr-namespace:GpuInterop;assembly=GpuInterop">
+  <Grid>
+    <ContentControl Content="{Binding $parent[local:GpuDemo].Demo}" />
+
+    <StackPanel>
+      <TextBlock Margin="0 40 0 0" Text="{Binding $parent[local:GpuDemo].Info}"/>
+    </StackPanel>
+    <Grid ColumnDefinitions="*,Auto" Margin="20">
+      <StackPanel Grid.Column="1" MinWidth="300">
+        <TextBlock>Yaw</TextBlock>
+        <Slider Value="{Binding $parent[local:GpuDemo].Yaw, Mode=TwoWay}" Maximum="10"/>
+        <TextBlock>Pitch</TextBlock>
+        <Slider Value="{Binding $parent[local:GpuDemo].Pitch, Mode=TwoWay}" Maximum="10"/>
+        <TextBlock>Roll</TextBlock>
+        <Slider Value="{Binding $parent[local:GpuDemo].Roll, Mode=TwoWay}" Maximum="10"/>
+        <StackPanel IsVisible="{Binding $parent[local:GpuDemo].DiscoVisible}">
+          <StackPanel Orientation="Horizontal">
+            <TextBlock FontWeight="Bold" Foreground="#C000C0">D</TextBlock>
+            <TextBlock FontWeight="Bold" Foreground="#00C090">I</TextBlock>
+            <TextBlock FontWeight="Bold" Foreground="#90C000">S</TextBlock>
+            <TextBlock FontWeight="Bold" Foreground="#C09000">C</TextBlock>
+            <TextBlock FontWeight="Bold" Foreground="#00C090">O</TextBlock>
+          </StackPanel>
+          <Slider Value="{Binding $parent[local:GpuDemo].Disco, Mode=TwoWay}" Maximum="1"/>
+        </StackPanel>
+      </StackPanel>
+    </Grid>
+  </Grid>
+</UserControl>
diff --git a/samples/GpuInterop/GpuDemo.axaml.cs b/samples/GpuInterop/GpuDemo.axaml.cs
new file mode 100644
index 0000000000..f7acac09e1
--- /dev/null
+++ b/samples/GpuInterop/GpuDemo.axaml.cs
@@ -0,0 +1,116 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace GpuInterop;
+
+public class GpuDemo : UserControl
+{
+    public GpuDemo()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+    
+    private float _yaw = 5;
+
+    public static readonly DirectProperty<GpuDemo, float> YawProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, float>("Yaw", o => o.Yaw, (o, v) => o.Yaw = v);
+
+    public float Yaw
+    {
+        get => _yaw;
+        set => SetAndRaise(YawProperty, ref _yaw, value);
+    }
+
+    private float _pitch = 5;
+
+    public static readonly DirectProperty<GpuDemo, float> PitchProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, float>("Pitch", o => o.Pitch, (o, v) => o.Pitch = v);
+
+    public float Pitch
+    {
+        get => _pitch;
+        set => SetAndRaise(PitchProperty, ref _pitch, value);
+    }
+
+
+    private float _roll = 5;
+
+    public static readonly DirectProperty<GpuDemo, float> RollProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, float>("Roll", o => o.Roll, (o, v) => o.Roll = v);
+
+    public float Roll
+    {
+        get => _roll;
+        set => SetAndRaise(RollProperty, ref _roll, value);
+    }
+
+
+    private float _disco;
+
+    public static readonly DirectProperty<GpuDemo, float> DiscoProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, float>("Disco", o => o.Disco, (o, v) => o.Disco = v);
+
+    public float Disco
+    {
+        get => _disco;
+        set => SetAndRaise(DiscoProperty, ref _disco, value);
+    }
+
+    private string _info = string.Empty;
+
+    public static readonly DirectProperty<GpuDemo, string> InfoProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, string>("Info", o => o.Info, (o, v) => o.Info = v);
+
+    public string Info
+    {
+        get => _info;
+        set => SetAndRaise(InfoProperty, ref _info, value);
+    }
+    
+    private bool _discoVisible;
+
+    public static readonly DirectProperty<GpuDemo, bool> DiscoVisibleProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, bool>("DiscoVisible", o => o.DiscoVisible,
+            (o, v) => o._discoVisible = v);
+
+    public bool DiscoVisible
+    {
+        get => _discoVisible;
+        set => SetAndRaise(DiscoVisibleProperty, ref _discoVisible, value);
+    }
+    
+    private IGpuDemo _demo;
+
+    public static readonly DirectProperty<GpuDemo, IGpuDemo> DemoProperty =
+        AvaloniaProperty.RegisterDirect<GpuDemo, IGpuDemo>("Demo", o => o.Demo,
+            (o, v) => o._demo = v);
+
+    public IGpuDemo Demo
+    {
+        get => _demo;
+        set => SetAndRaise(DemoProperty, ref _demo, value);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        if (change.Property == YawProperty
+            || change.Property == PitchProperty
+            || change.Property == RollProperty
+            || change.Property == DiscoProperty
+            || change.Property == DemoProperty
+           )
+        {
+            if (change.Property == DemoProperty)
+                ((IGpuDemo)change.OldValue)?.Update(null, 0, 0, 0, 0);
+            _demo?.Update(this, Yaw, Pitch, Roll, Disco);
+        }
+
+        base.OnPropertyChanged(change);
+    }
+}
+
+public interface IGpuDemo
+{
+    void Update(GpuDemo parent, float yaw, float pitch, float roll, float disco);
+}
diff --git a/samples/GpuInterop/GpuInterop.csproj b/samples/GpuInterop/GpuInterop.csproj
new file mode 100644
index 0000000000..88e6d3d283
--- /dev/null
+++ b/samples/GpuInterop/GpuInterop.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <UseD3DCompiler>true</UseD3DCompiler>
+    <UseSharpDXMathematics>true</UseSharpDXMathematics>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="D3DDemo\MiniCube.fx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Silk.NET.Vulkan" Version="2.16.0" />
+    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" />
+    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" />
+    <PackageReference Include="System.Reactive" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="VulkanDemo\Assets\Shaders\Assets" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\src\Avalonia.Base\Rendering\SwapchainBase.cs" />
+    <None Remove="VulkanDemo\Assets\Shaders\frag.spirv" />
+    <EmbeddedResource Include="VulkanDemo\Assets\Shaders\frag.spirv" />
+    <None Remove="VulkanDemo\Assets\Shaders\vert.spirv" />
+    <EmbeddedResource Include="VulkanDemo\Assets\Shaders\vert.spirv" />
+    <EmbeddedResource Include="../ControlCatalog/Pages/teapot.bin" />
+  </ItemGroup>
+  
+  <Import Project="..\..\build\SampleApp.props" />
+  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\SharpDX.props" />
+</Project>
diff --git a/samples/GpuInterop/MainWindow.axaml b/samples/GpuInterop/MainWindow.axaml
new file mode 100644
index 0000000000..afb025ec27
--- /dev/null
+++ b/samples/GpuInterop/MainWindow.axaml
@@ -0,0 +1,13 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:gpuInterop="clr-namespace:GpuInterop"
+        xmlns:d3DDemo="clr-namespace:GpuInterop.D3DDemo"
+        xmlns:vulkanDemo="clr-namespace:GpuInterop.VulkanDemo"
+        x:Class="GpuInterop.MainWindow">
+  <gpuInterop:GpuDemo>
+    <gpuInterop:GpuDemo.Demo>
+      <!--<d3DDemo:D3D11DemoControl/>-->
+      <vulkanDemo:VulkanDemoControl/>
+    </gpuInterop:GpuDemo.Demo>
+  </gpuInterop:GpuDemo>
+</Window>
diff --git a/samples/GpuInterop/MainWindow.axaml.cs b/samples/GpuInterop/MainWindow.axaml.cs
new file mode 100644
index 0000000000..8fc8926783
--- /dev/null
+++ b/samples/GpuInterop/MainWindow.axaml.cs
@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace GpuInterop
+{
+    public class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+            this.AttachDevTools();
+            this.Renderer.DrawFps = true;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/GpuInterop/Program.cs b/samples/GpuInterop/Program.cs
new file mode 100644
index 0000000000..8d7ccf4866
--- /dev/null
+++ b/samples/GpuInterop/Program.cs
@@ -0,0 +1,15 @@
+global using System.Reactive.Disposables;
+using Avalonia;
+namespace GpuInterop
+{
+    public class Program
+    {
+        static void Main(string[] args) => BuildAvaloniaApp()
+            .StartWithClassicDesktopLifetime(args);
+
+        public static AppBuilder BuildAvaloniaApp() =>
+            AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace();
+    }
+}
diff --git a/samples/GpuInterop/VulkanDemo/Assets/Shaders/Makefile b/samples/GpuInterop/VulkanDemo/Assets/Shaders/Makefile
new file mode 100644
index 0000000000..900e35a93e
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/Assets/Shaders/Makefile
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+all: vert.spirv frag.spirv
+.PHONY: all
+
+vert.spirv: vert.glsl
+	glslc  -fshader-stage=vert vert.glsl -o vert.spirv
+
+frag.spirv: frag.glsl
+	glslc  -fshader-stage=frag frag.glsl -o frag.spirv
+
+
diff --git a/samples/GpuInterop/VulkanDemo/Assets/Shaders/frag.glsl b/samples/GpuInterop/VulkanDemo/Assets/Shaders/frag.glsl
new file mode 100644
index 0000000000..31e9f00390
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/Assets/Shaders/frag.glsl
@@ -0,0 +1,42 @@
+#version 450
+	layout(location = 0) in vec3 FragPos; 
+	layout(location = 1) in vec3 VecPos; 
+	layout(location = 2) in vec3 Normal;
+	layout(push_constant) uniform constants{
+    	layout(offset = 0) float maxY;
+    	layout(offset = 4) float minY;
+    	layout(offset = 8) float time;
+    	layout(offset = 12) float disco;
+    };
+	layout(location = 0) out vec4 outFragColor;
+
+	void main()
+	{
+		float y = (VecPos.y - minY) / (maxY - minY);
+		float c = cos(atan(VecPos.x, VecPos.z) * 20.0 + time * 40.0 + y * 50.0);
+		float s = sin(-atan(VecPos.z, VecPos.x) * 20.0 - time * 20.0 - y * 30.0);
+
+		vec3 discoColor = vec3(
+			0.5 + abs(0.5 - y) * cos(time * 10.0),
+			0.25 + (smoothstep(0.3, 0.8, y) * (0.5 - c / 4.0)),
+			0.25 + abs((smoothstep(0.1, 0.4, y) * (0.5 - s / 4.0))));
+
+		vec3 objectColor = vec3((1.0 - y), 0.40 +  y / 4.0, y * 0.75 + 0.25);
+		objectColor = objectColor * (1.0 - disco) + discoColor * disco;
+
+		float ambientStrength = 0.3;
+		vec3 lightColor = vec3(1.0, 1.0, 1.0);
+		vec3 lightPos = vec3(maxY * 2.0, maxY * 2.0, maxY * 2.0);
+		vec3 ambient = ambientStrength * lightColor;
+
+
+		vec3 norm = normalize(Normal);
+		vec3 lightDir = normalize(lightPos - FragPos);  
+
+		float diff = max(dot(norm, lightDir), 0.0);
+		vec3 diffuse = diff * lightColor;
+
+		vec3 result = (ambient + diffuse) * objectColor;
+		outFragColor = vec4(result, 1.0);
+
+	}
\ No newline at end of file
diff --git a/samples/GpuInterop/VulkanDemo/Assets/Shaders/frag.spirv b/samples/GpuInterop/VulkanDemo/Assets/Shaders/frag.spirv
new file mode 100644
index 0000000000..dbac67c368
Binary files /dev/null and b/samples/GpuInterop/VulkanDemo/Assets/Shaders/frag.spirv differ
diff --git a/samples/GpuInterop/VulkanDemo/Assets/Shaders/vert.glsl b/samples/GpuInterop/VulkanDemo/Assets/Shaders/vert.glsl
new file mode 100644
index 0000000000..c700d78d25
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/Assets/Shaders/vert.glsl
@@ -0,0 +1,36 @@
+#version 450
+	layout(location = 0) in vec3 aPos;
+	layout(location = 1) in vec3 aNormal;
+
+	layout(location = 0) out vec3 FragPos;
+	layout(location = 1) out vec3 VecPos;  
+	layout(location = 2) out vec3 Normal;
+
+	layout(push_constant) uniform constants{
+        float maxY;
+    	float minY;
+        float time;
+        float disco;
+    	mat4 model;
+    };
+    
+    layout(binding = 0) uniform UniformBufferObject {
+        mat4 projection;
+    } ubo;
+    
+	void main()
+	{
+		float discoScale = sin(time * 10.0) / 10.0;
+		float distortionX = 1.0 + disco * cos(time * 20.0) / 10.0;
+		
+		float scale = 1.0 + disco * discoScale;
+		
+		vec3 scaledPos = aPos;
+		scaledPos.x = scaledPos.x * distortionX;
+		
+		scaledPos *= scale;
+		gl_Position = ubo.projection * model * vec4(scaledPos, 1.0);
+		FragPos = vec3(model * vec4(aPos, 1.0));
+		VecPos = aPos;
+		Normal = normalize(vec3(model * vec4(aNormal, 1.0)));
+	}
\ No newline at end of file
diff --git a/samples/GpuInterop/VulkanDemo/Assets/Shaders/vert.spirv b/samples/GpuInterop/VulkanDemo/Assets/Shaders/vert.spirv
new file mode 100644
index 0000000000..3bb2ba9383
Binary files /dev/null and b/samples/GpuInterop/VulkanDemo/Assets/Shaders/vert.spirv differ
diff --git a/samples/GpuInterop/VulkanDemo/ByteString.cs b/samples/GpuInterop/VulkanDemo/ByteString.cs
new file mode 100644
index 0000000000..bce66e017d
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/ByteString.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace GpuInterop.VulkanDemo;
+
+unsafe class ByteString : IDisposable
+{
+    public IntPtr Pointer { get; }
+
+    public ByteString(string s)
+    {
+        Pointer = Marshal.StringToHGlobalAnsi(s);
+    }
+
+    public void Dispose()
+    {
+        Marshal.FreeHGlobal(Pointer);
+    }
+
+    public static implicit operator byte*(ByteString h) => (byte*)h.Pointer;
+}
+    
+unsafe class ByteStringList : IDisposable
+{
+    private List<ByteString> _inner;
+    private byte** _ptr;
+
+    public ByteStringList(IEnumerable<string> items)
+    {
+        _inner = items.Select(x => new ByteString(x)).ToList();
+        _ptr = (byte**)Marshal.AllocHGlobal(IntPtr.Size * _inner.Count + 1);
+        for (var c = 0; c < _inner.Count; c++)
+            _ptr[c] = (byte*)_inner[c].Pointer;
+    }
+
+    public int Count => _inner.Count;
+    public uint UCount => (uint)_inner.Count;
+
+    public void Dispose()
+    {
+        Marshal.FreeHGlobal(new IntPtr(_ptr));
+    }
+
+    public static implicit operator byte**(ByteStringList h) => h._ptr;
+}
diff --git a/samples/GpuInterop/VulkanDemo/D3DMemoryHelper.cs b/samples/GpuInterop/VulkanDemo/D3DMemoryHelper.cs
new file mode 100644
index 0000000000..a0b7d32d3b
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/D3DMemoryHelper.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Avalonia;
+using SharpDX.Direct3D;
+using SharpDX.Direct3D11;
+using SharpDX.DXGI;
+using D3DDevice = SharpDX.Direct3D11.Device;
+using DxgiFactory1 = SharpDX.DXGI.Factory1;
+namespace GpuInterop.VulkanDemo;
+
+public class D3DMemoryHelper
+{
+    public static D3DDevice CreateDeviceByLuid(Span<byte> luid)
+    {
+        var factory = new DxgiFactory1();
+        var longLuid = MemoryMarshal.Cast<byte, long>(luid)[0];
+        for (var c = 0; c < factory.GetAdapterCount1(); c++)
+        {
+            using var adapter = factory.GetAdapter1(0);
+            if (adapter.Description1.Luid != longLuid)
+                continue;
+
+            return new D3DDevice(adapter, DeviceCreationFlags.None,
+                new[]
+                {
+                    FeatureLevel.Level_12_1, FeatureLevel.Level_12_0, FeatureLevel.Level_11_1,
+                    FeatureLevel.Level_11_0, FeatureLevel.Level_10_0, FeatureLevel.Level_9_3,
+                    FeatureLevel.Level_9_2, FeatureLevel.Level_9_1,
+                });
+        }
+
+        throw new ArgumentException("Device with the corresponding LUID not found");
+    }
+
+    public static Texture2D CreateMemoryHandle(D3DDevice device, PixelSize size, Silk.NET.Vulkan.Format format)
+    {
+        if (format != Silk.NET.Vulkan.Format.R8G8B8A8Unorm)
+            throw new ArgumentException("Not supported format");
+        return new Texture2D(device,
+            new Texture2DDescription
+            {
+                Format = Format.R8G8B8A8_UNorm,
+                Width = size.Width,
+                Height = size.Height,
+                ArraySize = 1,
+                MipLevels = 1,
+                SampleDescription = new SampleDescription { Count = 1, Quality = 0 },
+                CpuAccessFlags = default,
+                OptionFlags = ResourceOptionFlags.SharedKeyedmutex,
+                BindFlags = BindFlags.RenderTarget | BindFlags.ShaderResource
+            });
+    }
+}
diff --git a/samples/GpuInterop/VulkanDemo/VulkanBufferHelper.cs b/samples/GpuInterop/VulkanDemo/VulkanBufferHelper.cs
new file mode 100644
index 0000000000..949a951a36
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanBufferHelper.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Runtime.CompilerServices;
+using Silk.NET.Vulkan;
+using SilkNetDemo;
+using Buffer = Silk.NET.Vulkan.Buffer;
+using SystemBuffer = System.Buffer;
+
+namespace GpuInterop.VulkanDemo;
+
+static class VulkanBufferHelper
+{
+    public unsafe static void AllocateBuffer<T>(VulkanContext vk,
+        BufferUsageFlags bufferUsageFlags,
+        out Buffer buffer, out DeviceMemory memory,
+        Span<T> initialData) where T:unmanaged
+    {
+        var api = vk.Api;
+        var device = vk.Device;
+
+        var size = Unsafe.SizeOf<T>() * initialData.Length;
+        var bufferInfo = new BufferCreateInfo()
+        {
+            SType = StructureType.BufferCreateInfo,
+            Size = (ulong)size,
+            Usage = bufferUsageFlags,
+            SharingMode = SharingMode.Exclusive
+        };
+        api.CreateBuffer(device, bufferInfo, null, out buffer).ThrowOnError();
+
+        api.GetBufferMemoryRequirements(device, buffer, out var memoryRequirements);
+
+        var physicalDevice = vk.PhysicalDevice;
+
+        var memoryAllocateInfo = new MemoryAllocateInfo
+        {
+            SType = StructureType.MemoryAllocateInfo,
+            AllocationSize = memoryRequirements.Size,
+            MemoryTypeIndex = (uint)FindSuitableMemoryTypeIndex(api,
+                physicalDevice,
+                memoryRequirements.MemoryTypeBits,
+                MemoryPropertyFlags.MemoryPropertyHostCoherentBit |
+                MemoryPropertyFlags.MemoryPropertyHostVisibleBit)
+        };
+
+        api.AllocateMemory(device, memoryAllocateInfo, null, out memory).ThrowOnError();
+        api.BindBufferMemory(device, buffer, memory, 0);
+        UpdateBufferMemory(vk, memory, initialData);
+    }
+
+    public static unsafe void UpdateBufferMemory<T>(VulkanContext vk, DeviceMemory memory,
+        Span<T> data) where T : unmanaged
+    {
+        var api = vk.Api;
+        var device = vk.Device;
+
+        var size = data.Length * Unsafe.SizeOf<T>();
+        void* pointer = null;
+        api.MapMemory(device, memory, 0, (ulong)size, 0, ref pointer);
+
+        data.CopyTo(new Span<T>(pointer, size));
+        
+        api.UnmapMemory(device, memory);
+
+    }
+
+    private static int FindSuitableMemoryTypeIndex(Vk api, PhysicalDevice physicalDevice, uint memoryTypeBits,
+        MemoryPropertyFlags flags)
+    {
+        api.GetPhysicalDeviceMemoryProperties(physicalDevice, out var properties);
+
+        for (var i = 0; i < properties.MemoryTypeCount; i++)
+        {
+            var type = properties.MemoryTypes[i];
+
+            if ((memoryTypeBits & (1 << i)) != 0 && type.PropertyFlags.HasFlag(flags)) return i;
+        }
+
+        return -1;
+    }
+}
\ No newline at end of file
diff --git a/samples/GpuInterop/VulkanDemo/VulkanCommandBufferPool.cs b/samples/GpuInterop/VulkanDemo/VulkanCommandBufferPool.cs
new file mode 100644
index 0000000000..65a05c5226
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanCommandBufferPool.cs
@@ -0,0 +1,224 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Input;
+using Silk.NET.Vulkan;
+using SilkNetDemo;
+
+namespace Avalonia.Vulkan
+{
+    public class VulkanCommandBufferPool : IDisposable
+    {
+        private readonly Vk _api;
+        private readonly Device _device;
+        private readonly Queue _queue;
+        private readonly CommandPool _commandPool;
+
+        private readonly List<VulkanCommandBuffer> _usedCommandBuffers = new();
+        private object _lock = new object();
+
+        public unsafe VulkanCommandBufferPool(Vk api, Device device, Queue queue, uint queueFamilyIndex)
+        {
+            _api = api;
+            _device = device;
+            _queue = queue;
+
+            var commandPoolCreateInfo = new CommandPoolCreateInfo
+            {
+                SType = StructureType.CommandPoolCreateInfo,
+                Flags = CommandPoolCreateFlags.CommandPoolCreateResetCommandBufferBit,
+                QueueFamilyIndex = queueFamilyIndex
+            };
+
+            _api.CreateCommandPool(_device, commandPoolCreateInfo, null, out _commandPool)
+                .ThrowOnError();
+        }
+
+        public unsafe void Dispose()
+        {
+            lock (_lock)
+            {
+                FreeUsedCommandBuffers();
+                _api.DestroyCommandPool(_device, _commandPool, null);
+            }
+        }
+
+        private CommandBuffer AllocateCommandBuffer()
+        {
+            var commandBufferAllocateInfo = new CommandBufferAllocateInfo
+            {
+                SType = StructureType.CommandBufferAllocateInfo,
+                CommandPool = _commandPool,
+                CommandBufferCount = 1,
+                Level = CommandBufferLevel.Primary
+            };
+
+            lock (_lock)
+            {
+                _api.AllocateCommandBuffers(_device, commandBufferAllocateInfo, out var commandBuffer);
+
+                return commandBuffer;
+            }
+        }
+
+        public VulkanCommandBuffer CreateCommandBuffer()
+        {
+            return new(_api, _device, _queue, this);
+        }
+
+        public void FreeUsedCommandBuffers()
+        {
+            lock (_lock)
+            {
+                foreach (var usedCommandBuffer in _usedCommandBuffers) usedCommandBuffer.Dispose();
+
+                _usedCommandBuffers.Clear();
+            }
+        }
+
+        private void DisposeCommandBuffer(VulkanCommandBuffer commandBuffer)
+        {
+            lock (_lock)
+            {
+                _usedCommandBuffers.Add(commandBuffer);
+            }
+        }
+
+        public class VulkanCommandBuffer : IDisposable
+        {
+            private readonly VulkanCommandBufferPool _commandBufferPool;
+            private readonly Vk _api;
+            private readonly Device _device;
+            private readonly Queue _queue;
+            private readonly Fence _fence;
+            private bool _hasEnded;
+            private bool _hasStarted;
+
+            public IntPtr Handle => InternalHandle.Handle;
+
+            internal CommandBuffer InternalHandle { get; }
+
+            internal unsafe VulkanCommandBuffer(Vk api, Device device, Queue queue, VulkanCommandBufferPool commandBufferPool)
+            {
+                _api = api;
+                _device = device;
+                _queue = queue;
+                _commandBufferPool = commandBufferPool;
+
+                InternalHandle = _commandBufferPool.AllocateCommandBuffer();
+
+                var fenceCreateInfo = new FenceCreateInfo()
+                {
+                    SType = StructureType.FenceCreateInfo,
+                    Flags = FenceCreateFlags.FenceCreateSignaledBit
+                };
+
+                api.CreateFence(device, fenceCreateInfo, null, out _fence);
+            }
+
+            public unsafe void Dispose()
+            {
+                _api.WaitForFences(_device, 1, _fence, true, ulong.MaxValue);
+                lock (_commandBufferPool._lock)
+                {
+                    _api.FreeCommandBuffers(_device, _commandBufferPool._commandPool, 1, InternalHandle);
+                }
+                _api.DestroyFence(_device, _fence, null);
+            }
+
+            public void BeginRecording()
+            {
+                if (!_hasStarted)
+                {
+                    _hasStarted = true;
+
+                    var beginInfo = new CommandBufferBeginInfo
+                    {
+                        SType = StructureType.CommandBufferBeginInfo,
+                        Flags = CommandBufferUsageFlags.CommandBufferUsageOneTimeSubmitBit
+                    };
+
+                    _api.BeginCommandBuffer(InternalHandle, beginInfo);
+                }
+            }
+
+            public void EndRecording()
+            {
+                if (_hasStarted && !_hasEnded)
+                {
+                    _hasEnded = true;
+
+                    _api.EndCommandBuffer(InternalHandle);
+                }
+            }
+
+            public void Submit()
+            {
+                Submit(null, null, null, _fence);
+            }
+
+            public class KeyedMutexSubmitInfo
+            {
+                public ulong? AcquireKey { get; set; }
+                public ulong? ReleaseKey { get; set; }
+                public DeviceMemory DeviceMemory { get; set; }
+            }
+            
+            public unsafe void Submit(
+                ReadOnlySpan<Semaphore> waitSemaphores,
+                ReadOnlySpan<PipelineStageFlags> waitDstStageMask = default,
+                ReadOnlySpan<Semaphore> signalSemaphores = default,
+                Fence? fence = null,
+                KeyedMutexSubmitInfo keyedMutex = null)
+            {
+                EndRecording();
+
+                if (!fence.HasValue)
+                    fence = _fence;
+
+
+                ulong acquireKey = keyedMutex?.AcquireKey ?? 0, releaseKey = keyedMutex?.ReleaseKey ?? 0;
+                DeviceMemory devMem = keyedMutex?.DeviceMemory ?? default;
+                uint timeout = uint.MaxValue;
+                Win32KeyedMutexAcquireReleaseInfoKHR mutex = default;
+                if (keyedMutex != null)
+                    mutex = new Win32KeyedMutexAcquireReleaseInfoKHR
+                    {
+                        SType = StructureType.Win32KeyedMutexAcquireReleaseInfoKhr,
+                        AcquireCount = keyedMutex.AcquireKey.HasValue ? 1u : 0u,
+                        ReleaseCount = keyedMutex.ReleaseKey.HasValue ? 1u : 0u,
+                        PAcquireKeys = &acquireKey,
+                        PReleaseKeys = &releaseKey,
+                        PAcquireSyncs = &devMem,
+                        PReleaseSyncs = &devMem,
+                        PAcquireTimeouts = &timeout
+                    };
+                
+                fixed (Semaphore* pWaitSemaphores = waitSemaphores, pSignalSemaphores = signalSemaphores)
+                {
+                    fixed (PipelineStageFlags* pWaitDstStageMask = waitDstStageMask)
+                    {
+                        var commandBuffer = InternalHandle;
+                        var submitInfo = new SubmitInfo
+                        {
+                            PNext = keyedMutex != null ? &mutex : null,
+                            SType = StructureType.SubmitInfo,
+                            WaitSemaphoreCount = waitSemaphores != null ? (uint)waitSemaphores.Length : 0,
+                            PWaitSemaphores = pWaitSemaphores,
+                            PWaitDstStageMask = pWaitDstStageMask,
+                            CommandBufferCount = 1,
+                            PCommandBuffers = &commandBuffer,
+                            SignalSemaphoreCount = signalSemaphores != null ? (uint)signalSemaphores.Length : 0,
+                            PSignalSemaphores = pSignalSemaphores,
+                        };
+
+                        _api.ResetFences(_device, 1, fence.Value);
+
+                        _api.QueueSubmit(_queue, 1, submitInfo, fence.Value);
+                    }
+                }
+
+                _commandBufferPool.DisposeCommandBuffer(this);
+            }
+        }
+    }
+}
diff --git a/samples/GpuInterop/VulkanDemo/VulkanContent.cs b/samples/GpuInterop/VulkanDemo/VulkanContent.cs
new file mode 100644
index 0000000000..b16343190a
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanContent.cs
@@ -0,0 +1,829 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Avalonia;
+using Avalonia.Threading;
+using Silk.NET.Vulkan;
+using SilkNetDemo;
+using Buffer = System.Buffer;
+using Image = Silk.NET.Vulkan.Image;
+
+namespace GpuInterop.VulkanDemo;
+
+unsafe class VulkanContent : IDisposable
+{
+    private readonly VulkanContext _context;
+    private ShaderModule _vertShader;
+    private ShaderModule _fragShader;
+    private PipelineLayout _pipelineLayout;
+    private RenderPass _renderPass;
+    private Pipeline _pipeline;
+    private DescriptorSetLayout _descriptorSetLayout;
+    private Silk.NET.Vulkan.Buffer _vertexBuffer;
+    private DeviceMemory _vertexBufferMemory;
+    private Silk.NET.Vulkan.Buffer _indexBuffer;
+    private DeviceMemory _indexBufferMemory;
+    private Silk.NET.Vulkan.Buffer _uniformBuffer;
+    private DeviceMemory _uniformBufferMemory;
+    private Framebuffer _framebuffer;
+
+    private Image _depthImage;
+    private DeviceMemory _depthImageMemory;
+    private ImageView _depthImageView;
+
+    public VulkanContent(VulkanContext context)
+    {
+        _context = context;
+        var name = typeof(VulkanContent).Assembly.GetManifestResourceNames().First(x => x.Contains("teapot.bin"));
+        using (var sr = new BinaryReader(typeof(VulkanContent).Assembly.GetManifestResourceStream(name)))
+        {
+            var buf = new byte[sr.ReadInt32()];
+            sr.Read(buf, 0, buf.Length);
+            var points = new float[buf.Length / 4];
+            Buffer.BlockCopy(buf, 0, points, 0, buf.Length);
+            buf = new byte[sr.ReadInt32()];
+            sr.Read(buf, 0, buf.Length);
+            _indices = new ushort[buf.Length / 2];
+            Buffer.BlockCopy(buf, 0, _indices, 0, buf.Length);
+            _points = new Vertex[points.Length / 3];
+            for (var primitive = 0; primitive < points.Length / 3; primitive++)
+            {
+                var srci = primitive * 3;
+                _points[primitive] = new Vertex
+                {
+                    Position = new Vector3(points[srci], points[srci + 1], points[srci + 2])
+                };
+            }
+
+            for (int i = 0; i < _indices.Length; i += 3)
+            {
+                Vector3 a = _points[_indices[i]].Position;
+                Vector3 b = _points[_indices[i + 1]].Position;
+                Vector3 c = _points[_indices[i + 2]].Position;
+                var normal = Vector3.Normalize(Vector3.Cross(c - b, a - b));
+
+                _points[_indices[i]].Normal += normal;
+                _points[_indices[i + 1]].Normal += normal;
+                _points[_indices[i + 2]].Normal += normal;
+            }
+
+            for (int i = 0; i < _points.Length; i++)
+            {
+                _points[i].Normal = Vector3.Normalize(_points[i].Normal);
+                _maxY = Math.Max(_maxY, _points[i].Position.Y);
+                _minY = Math.Min(_minY, _points[i].Position.Y);
+            }
+        }
+
+        var api = _context.Api;
+        var device = _context.Device;
+        var vertShaderData = GetShader(false);
+        var fragShaderData = GetShader(true);
+
+        fixed (byte* ptr = vertShaderData)
+        {
+            var shaderCreateInfo = new ShaderModuleCreateInfo()
+            {
+                SType = StructureType.ShaderModuleCreateInfo,
+                CodeSize = (nuint)vertShaderData.Length,
+                PCode = (uint*)ptr,
+            };
+
+            api.CreateShaderModule(device, shaderCreateInfo, null, out _vertShader);
+        }
+
+        fixed (byte* ptr = fragShaderData)
+        {
+            var shaderCreateInfo = new ShaderModuleCreateInfo()
+            {
+                SType = StructureType.ShaderModuleCreateInfo,
+                CodeSize = (nuint)fragShaderData.Length,
+                PCode = (uint*)ptr,
+            };
+
+            api.CreateShaderModule(device, shaderCreateInfo, null, out _fragShader);
+        }
+
+        CreateBuffers();
+    }
+
+    private byte[] GetShader(bool fragment)
+    {
+        var name = typeof(VulkanContent).Assembly.GetManifestResourceNames()
+            .First(x => x.Contains((fragment ? "frag" : "vert") + ".spirv"));
+        using (var sr = typeof(VulkanContent).Assembly.GetManifestResourceStream(name))
+        {
+            using (var mem = new MemoryStream())
+            {
+                sr.CopyTo(mem);
+                return mem.ToArray();
+            }
+        }
+    }
+
+    private PixelSize? _previousImageSize = PixelSize.Empty;
+
+   
+    public void Render(VulkanImage image,
+        double yaw, double pitch, double roll, double disco)
+    {
+
+        var api = _context.Api;
+        
+        if (image.Size != _previousImageSize)
+            CreateTemporalObjects(image.Size);
+
+        _previousImageSize = image.Size;
+
+        
+        var model = Matrix4x4.CreateFromYawPitchRoll((float)yaw, (float)pitch, (float)roll);
+        var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, -1, 0));
+        var projection =
+            Matrix4x4.CreatePerspectiveFieldOfView((float)(Math.PI / 4), (float)((float)image.Size.Width / image.Size.Height),
+                0.01f, 1000);
+        
+        var vertexConstant = new VertextPushConstant()
+        {
+            Disco = (float)disco,
+            MinY = _minY,
+            MaxY = _maxY,
+            Model = model,
+            Time = (float)St.Elapsed.TotalSeconds
+        };
+
+        var commandBuffer = _context.Pool.CreateCommandBuffer();
+        commandBuffer.BeginRecording();
+
+        _colorAttachment.TransitionLayout(commandBuffer.InternalHandle,
+            ImageLayout.Undefined, AccessFlags.None,
+            ImageLayout.ColorAttachmentOptimal, AccessFlags.ColorAttachmentWriteBit);
+
+        var commandBufferHandle = new CommandBuffer(commandBuffer.Handle);
+
+        api.CmdSetViewport(commandBufferHandle, 0, 1,
+            new Viewport()
+            {
+                Width = (float)image.Size.Width,
+                Height = (float)image.Size.Height,
+                MaxDepth = 1,
+                MinDepth = 0,
+                X = 0,
+                Y = 0
+            });
+
+        var scissor = new Rect2D
+        {
+            Extent = new Extent2D((uint?)image.Size.Width, (uint?)image.Size.Height)
+        };
+
+        api.CmdSetScissor(commandBufferHandle, 0, 1, &scissor);
+
+        var clearColor = new ClearValue(new ClearColorValue(1, 0, 0, 0.1f), new ClearDepthStencilValue(1, 0));
+        
+        var clearValues = new[] { clearColor, clearColor };
+
+
+        fixed (ClearValue* clearValue = clearValues)
+        {
+            var beginInfo = new RenderPassBeginInfo()
+            {
+                SType = StructureType.RenderPassBeginInfo,
+                RenderPass = _renderPass,
+                Framebuffer = _framebuffer,
+                RenderArea = new Rect2D(new Offset2D(0, 0), new Extent2D((uint?)image.Size.Width, (uint?)image.Size.Height)),
+                ClearValueCount = 2,
+                PClearValues = clearValue
+            };
+
+            api.CmdBeginRenderPass(commandBufferHandle, beginInfo, SubpassContents.Inline);
+        }
+
+        api.CmdBindPipeline(commandBufferHandle, PipelineBindPoint.Graphics, _pipeline);
+
+        var dset = _descriptorSet;
+        api.CmdBindDescriptorSets(commandBufferHandle, PipelineBindPoint.Graphics,
+            _pipelineLayout,0,1, &dset, null);
+
+        api.CmdPushConstants(commandBufferHandle, _pipelineLayout, ShaderStageFlags.ShaderStageVertexBit | ShaderStageFlags.FragmentBit, 0,
+            (uint)Marshal.SizeOf<VertextPushConstant>(), &vertexConstant);
+        api.CmdBindVertexBuffers(commandBufferHandle, 0, 1, _vertexBuffer, 0);
+        api.CmdBindIndexBuffer(commandBufferHandle, _indexBuffer, 0, IndexType.Uint16);
+
+        api.CmdDrawIndexed(commandBufferHandle, (uint)_indices.Length, 1, 0, 0, 0);
+
+        
+        api.CmdEndRenderPass(commandBufferHandle);
+        
+        _colorAttachment.TransitionLayout(commandBuffer.InternalHandle, ImageLayout.TransferSrcOptimal, AccessFlags.TransferReadBit);
+        image.TransitionLayout(commandBuffer.InternalHandle, ImageLayout.TransferDstOptimal, AccessFlags.TransferWriteBit);
+        
+        
+        var srcBlitRegion = new ImageBlit
+        {
+            SrcOffsets = new ImageBlit.SrcOffsetsBuffer
+            {
+                Element0 = new Offset3D(0, 0, 0),
+                Element1 = new Offset3D(image.Size.Width, image.Size.Height, 1),
+            },
+            DstOffsets = new ImageBlit.DstOffsetsBuffer
+            {
+                Element0 = new Offset3D(0, 0, 0),
+                Element1 = new Offset3D(image.Size.Width, image.Size.Height, 1),
+            },
+            SrcSubresource =
+                new ImageSubresourceLayers
+                {
+                    AspectMask = ImageAspectFlags.ImageAspectColorBit,
+                    BaseArrayLayer = 0,
+                    LayerCount = 1,
+                    MipLevel = 0
+                },
+            DstSubresource = new ImageSubresourceLayers
+            {
+                AspectMask = ImageAspectFlags.ImageAspectColorBit,
+                BaseArrayLayer = 0,
+                LayerCount = 1,
+                MipLevel = 0
+            }
+        };
+
+        api.CmdBlitImage(commandBuffer.InternalHandle, _colorAttachment.InternalHandle.Value,
+            ImageLayout.TransferSrcOptimal,
+            image.InternalHandle.Value, ImageLayout.TransferDstOptimal, 1, srcBlitRegion, Filter.Linear);
+        
+        commandBuffer.Submit();
+    }
+
+    public unsafe void Dispose()
+    {
+        if (_isInit)
+        {
+            var api = _context.Api;
+            var device = _context.Device;
+
+            DestroyTemporalObjects();
+
+            api.DestroyShaderModule(device, _vertShader, null);
+            api.DestroyShaderModule(device, _fragShader, null);
+
+            api.DestroyBuffer(device, _vertexBuffer, null);
+            api.FreeMemory(device, _vertexBufferMemory, null);
+
+            api.DestroyBuffer(device, _indexBuffer, null);
+            api.FreeMemory(device, _indexBufferMemory, null);
+            
+            
+        }
+
+        _isInit = false;
+    }
+
+    public unsafe void DestroyTemporalObjects()
+    {
+        if (_isInit)
+        {
+            if (_renderPass.Handle != 0)
+            {
+                var api = _context.Api;
+                var device = _context.Device;
+                api.FreeDescriptorSets(_context.Device, _context.DescriptorPool, new[] { _descriptorSet });
+                
+                api.DestroyImageView(device, _depthImageView, null);
+                api.DestroyImage(device, _depthImage, null);
+                api.FreeMemory(device, _depthImageMemory, null);
+
+                api.DestroyFramebuffer(device, _framebuffer, null);
+                api.DestroyPipeline(device, _pipeline, null);
+                api.DestroyPipelineLayout(device, _pipelineLayout, null);
+                api.DestroyRenderPass(device, _renderPass, null);
+                api.DestroyDescriptorSetLayout(device, _descriptorSetLayout, null);
+                
+                api.DestroyBuffer(device, _uniformBuffer, null);
+                api.FreeMemory(device, _uniformBufferMemory, null);
+                _colorAttachment?.Dispose();
+
+                _colorAttachment = null;
+                _depthImage = default;
+                _depthImageView = default;
+                _depthImageView = default;
+                _framebuffer = default;
+                _pipeline = default;
+                _renderPass = default;
+                _pipelineLayout = default;
+                _descriptorSetLayout = default;
+                _uniformBuffer = default;
+                _uniformBufferMemory = default;
+            }
+        }
+    }
+
+    private unsafe void CreateDepthAttachment(PixelSize size)
+    {
+        var imageCreateInfo = new ImageCreateInfo
+        {
+            SType = StructureType.ImageCreateInfo,
+            ImageType = ImageType.ImageType2D,
+            Format = Format.D32Sfloat,
+            Extent =
+                new Extent3D((uint?)size.Width,
+                    (uint?)size.Height, 1),
+            MipLevels = 1,
+            ArrayLayers = 1,
+            Samples = SampleCountFlags.SampleCount1Bit,
+            Tiling = ImageTiling.Optimal,
+            Usage = ImageUsageFlags.ImageUsageDepthStencilAttachmentBit,
+            SharingMode = SharingMode.Exclusive,
+            InitialLayout = ImageLayout.Undefined,
+            Flags = ImageCreateFlags.ImageCreateMutableFormatBit
+        };
+
+        var api = _context.Api;
+        var device = _context.Device;
+        api
+            .CreateImage(device, imageCreateInfo, null, out _depthImage).ThrowOnError();
+
+        api.GetImageMemoryRequirements(device, _depthImage,
+            out var memoryRequirements);
+
+        var memoryAllocateInfo = new MemoryAllocateInfo
+        {
+            SType = StructureType.MemoryAllocateInfo,
+            AllocationSize = memoryRequirements.Size,
+            MemoryTypeIndex = (uint)FindSuitableMemoryTypeIndex(api,
+                _context.PhysicalDevice,
+                memoryRequirements.MemoryTypeBits, MemoryPropertyFlags.MemoryPropertyDeviceLocalBit)
+        };
+
+        api.AllocateMemory(device, memoryAllocateInfo, null,
+            out _depthImageMemory).ThrowOnError();
+
+        api.BindImageMemory(device, _depthImage, _depthImageMemory, 0);
+
+        var componentMapping = new ComponentMapping(
+            ComponentSwizzle.R,
+            ComponentSwizzle.G,
+            ComponentSwizzle.B,
+            ComponentSwizzle.A);
+
+        var subresourceRange = new ImageSubresourceRange(ImageAspectFlags.ImageAspectDepthBit,
+            0, 1, 0, 1);
+
+        var imageViewCreateInfo = new ImageViewCreateInfo
+        {
+            SType = StructureType.ImageViewCreateInfo,
+            Image = _depthImage,
+            ViewType = ImageViewType.ImageViewType2D,
+            Format = Format.D32Sfloat,
+            Components = componentMapping,
+            SubresourceRange = subresourceRange
+        };
+
+        api
+            .CreateImageView(device, imageViewCreateInfo, null, out _depthImageView)
+            .ThrowOnError();
+    }
+
+    private unsafe void CreateTemporalObjects(PixelSize size)
+    {
+        DestroyTemporalObjects();
+        
+        var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, -1, 0));
+        var projection =
+            Matrix4x4.CreatePerspectiveFieldOfView((float)(Math.PI / 4), (float)((float)size.Width / size.Height),
+                0.01f, 1000);
+        
+        _colorAttachment = new VulkanImage(_context, (uint)Format.R8G8B8A8Unorm, size, false);
+        CreateDepthAttachment(size);
+
+        var api = _context.Api;
+        var device = _context.Device;
+        
+        // create renderpasses
+        var colorAttachment = new AttachmentDescription()
+        {
+            Format = Format.R8G8B8A8Unorm,
+            Samples = SampleCountFlags.SampleCount1Bit,
+            LoadOp = AttachmentLoadOp.Clear,
+            StoreOp = AttachmentStoreOp.Store,
+            InitialLayout = ImageLayout.Undefined,
+            FinalLayout = ImageLayout.ColorAttachmentOptimal,
+            StencilLoadOp = AttachmentLoadOp.DontCare,
+            StencilStoreOp = AttachmentStoreOp.DontCare
+        };
+
+        var depthAttachment = new AttachmentDescription()
+        {
+            Format = Format.D32Sfloat,
+            Samples = SampleCountFlags.SampleCount1Bit,
+            LoadOp = AttachmentLoadOp.Clear,
+            StoreOp = AttachmentStoreOp.DontCare,
+            InitialLayout = ImageLayout.Undefined,
+            FinalLayout = ImageLayout.DepthStencilAttachmentOptimal,
+            StencilLoadOp = AttachmentLoadOp.DontCare,
+            StencilStoreOp = AttachmentStoreOp.DontCare
+        };
+
+        var subpassDependency = new SubpassDependency()
+        {
+            SrcSubpass = Vk.SubpassExternal,
+            DstSubpass = 0,
+            SrcStageMask = PipelineStageFlags.PipelineStageColorAttachmentOutputBit,
+            SrcAccessMask = 0,
+            DstStageMask = PipelineStageFlags.PipelineStageColorAttachmentOutputBit,
+            DstAccessMask = AccessFlags.AccessColorAttachmentWriteBit
+        };
+
+        var colorAttachmentReference = new AttachmentReference()
+        {
+            Attachment = 0, Layout = ImageLayout.ColorAttachmentOptimal
+        };
+
+        var depthAttachmentReference = new AttachmentReference()
+        {
+            Attachment = 1, Layout = ImageLayout.DepthStencilAttachmentOptimal
+        };
+
+        var subpassDescription = new SubpassDescription()
+        {
+            PipelineBindPoint = PipelineBindPoint.Graphics,
+            ColorAttachmentCount = 1,
+            PColorAttachments = &colorAttachmentReference,
+            PDepthStencilAttachment = &depthAttachmentReference
+        };
+
+        var attachments = new[] { colorAttachment, depthAttachment };
+
+        fixed (AttachmentDescription* atPtr = attachments)
+        {
+            var renderPassCreateInfo = new RenderPassCreateInfo()
+            {
+                SType = StructureType.RenderPassCreateInfo,
+                AttachmentCount = (uint)attachments.Length,
+                PAttachments = atPtr,
+                SubpassCount = 1,
+                PSubpasses = &subpassDescription,
+                DependencyCount = 1,
+                PDependencies = &subpassDependency
+            };
+
+            api.CreateRenderPass(device, renderPassCreateInfo, null, out _renderPass).ThrowOnError();
+
+
+            // create framebuffer
+            var frameBufferAttachments = new[] { new ImageView(_colorAttachment.ViewHandle), _depthImageView };
+
+            fixed (ImageView* frAtPtr = frameBufferAttachments)
+            {
+                var framebufferCreateInfo = new FramebufferCreateInfo()
+                {
+                    SType = StructureType.FramebufferCreateInfo,
+                    RenderPass = _renderPass,
+                    AttachmentCount = (uint)frameBufferAttachments.Length,
+                    PAttachments = frAtPtr,
+                    Width = (uint)size.Width,
+                    Height = (uint)size.Height,
+                    Layers = 1
+                };
+
+                api.CreateFramebuffer(device, framebufferCreateInfo, null, out _framebuffer).ThrowOnError();
+            }
+        }
+
+        // Create pipeline
+        var pname = Marshal.StringToHGlobalAnsi("main");
+        var vertShaderStageInfo = new PipelineShaderStageCreateInfo()
+        {
+            SType = StructureType.PipelineShaderStageCreateInfo,
+            Stage = ShaderStageFlags.ShaderStageVertexBit,
+            Module = _vertShader,
+            PName = (byte*)pname,
+        };
+        var fragShaderStageInfo = new PipelineShaderStageCreateInfo()
+        {
+            SType = StructureType.PipelineShaderStageCreateInfo,
+            Stage = ShaderStageFlags.ShaderStageFragmentBit,
+            Module = _fragShader,
+            PName = (byte*)pname,
+        };
+
+        var stages = new[] { vertShaderStageInfo, fragShaderStageInfo };
+
+        var bindingDescription = Vertex.VertexInputBindingDescription;
+        var attributeDescription = Vertex.VertexInputAttributeDescription;
+
+        fixed (VertexInputAttributeDescription* attrPtr = attributeDescription)
+        {
+            var vertextInputInfo = new PipelineVertexInputStateCreateInfo()
+            {
+                SType = StructureType.PipelineVertexInputStateCreateInfo,
+                VertexAttributeDescriptionCount = (uint)attributeDescription.Length,
+                VertexBindingDescriptionCount = 1,
+                PVertexAttributeDescriptions = attrPtr,
+                PVertexBindingDescriptions = &bindingDescription
+            };
+
+            var inputAssembly = new PipelineInputAssemblyStateCreateInfo()
+            {
+                SType = StructureType.PipelineInputAssemblyStateCreateInfo,
+                Topology = PrimitiveTopology.TriangleList,
+                PrimitiveRestartEnable = false
+            };
+
+            var viewport = new Viewport()
+            {
+                X = 0,
+                Y = 0,
+                Width = (float)size.Width,
+                Height = (float)size.Height,
+                MinDepth = 0,
+                MaxDepth = 1
+            };
+
+            var scissor = new Rect2D()
+            {
+                Offset = new Offset2D(0, 0), Extent = new Extent2D((uint)viewport.Width, (uint)viewport.Height)
+            };
+
+            var pipelineViewPortCreateInfo = new PipelineViewportStateCreateInfo()
+            {
+                SType = StructureType.PipelineViewportStateCreateInfo,
+                ViewportCount = 1,
+                PViewports = &viewport,
+                ScissorCount = 1,
+                PScissors = &scissor
+            };
+
+            var rasterizerStateCreateInfo = new PipelineRasterizationStateCreateInfo()
+            {
+                SType = StructureType.PipelineRasterizationStateCreateInfo,
+                DepthClampEnable = false,
+                RasterizerDiscardEnable = false,
+                PolygonMode = PolygonMode.Fill,
+                LineWidth = 1,
+                CullMode = CullModeFlags.CullModeNone,
+                DepthBiasEnable = false
+            };
+
+            var multisampleStateCreateInfo = new PipelineMultisampleStateCreateInfo()
+            {
+                SType = StructureType.PipelineMultisampleStateCreateInfo,
+                SampleShadingEnable = false,
+                RasterizationSamples = SampleCountFlags.SampleCount1Bit
+            };
+
+            var depthStencilCreateInfo = new PipelineDepthStencilStateCreateInfo()
+            {
+                SType = StructureType.PipelineDepthStencilStateCreateInfo,
+                StencilTestEnable = false,
+                DepthCompareOp = CompareOp.Less,
+                DepthTestEnable = true,
+                DepthWriteEnable = true,
+                DepthBoundsTestEnable = false,
+            };
+
+            var colorBlendAttachmentState = new PipelineColorBlendAttachmentState()
+            {
+                ColorWriteMask = ColorComponentFlags.ColorComponentABit |
+                                 ColorComponentFlags.ColorComponentRBit |
+                                 ColorComponentFlags.ColorComponentGBit |
+                                 ColorComponentFlags.ColorComponentBBit,
+                BlendEnable = false
+            };
+
+            var colorBlendState = new PipelineColorBlendStateCreateInfo()
+            {
+                SType = StructureType.PipelineColorBlendStateCreateInfo,
+                LogicOpEnable = false,
+                AttachmentCount = 1,
+                PAttachments = &colorBlendAttachmentState
+            };
+
+            var dynamicStates = new DynamicState[] { DynamicState.Viewport, DynamicState.Scissor };
+
+            fixed (DynamicState* states = dynamicStates)
+            {
+                var dynamicStateCreateInfo = new PipelineDynamicStateCreateInfo()
+                {
+                    SType = StructureType.PipelineDynamicStateCreateInfo,
+                    DynamicStateCount = (uint)dynamicStates.Length,
+                    PDynamicStates = states
+                };
+
+                var vertexPushConstantRange = new PushConstantRange()
+                {
+                    Offset = 0,
+                    Size = (uint)Marshal.SizeOf<VertextPushConstant>(),
+                    StageFlags = ShaderStageFlags.ShaderStageVertexBit
+                };
+
+                var fragPushConstantRange = new PushConstantRange()
+                {
+                    //Offset = vertexPushConstantRange.Size,
+                    Size = (uint)Marshal.SizeOf<VertextPushConstant>(),
+                    StageFlags = ShaderStageFlags.ShaderStageFragmentBit
+                };
+
+                var layoutBindingInfo = new DescriptorSetLayoutBinding
+                {
+                    Binding = 0,
+                    StageFlags = ShaderStageFlags.VertexBit,
+                    DescriptorCount = 1,
+                    DescriptorType = DescriptorType.UniformBuffer,
+                };
+
+                var layoutInfo = new DescriptorSetLayoutCreateInfo
+                {
+                    SType = StructureType.DescriptorSetLayoutCreateInfo,
+                    BindingCount = 1,
+                    PBindings = &layoutBindingInfo
+                };
+                
+                api.CreateDescriptorSetLayout(device, &layoutInfo, null, out _descriptorSetLayout).ThrowOnError();
+                
+                var projView = view * projection;
+                VulkanBufferHelper.AllocateBuffer<UniformBuffer>(_context, BufferUsageFlags.UniformBufferBit,
+                    out _uniformBuffer,
+                    out _uniformBufferMemory, new[]
+                    {
+                        new UniformBuffer
+                        {
+                            Projection = projView
+                        }
+                    });
+                
+                var descriptorSetLayout = _descriptorSetLayout;
+                var descriptorCreateInfo = new DescriptorSetAllocateInfo
+                {
+                    SType = StructureType.DescriptorSetAllocateInfo,
+                    DescriptorPool = _context.DescriptorPool,
+                    DescriptorSetCount = 1,
+                    PSetLayouts = &descriptorSetLayout
+                };
+                api.AllocateDescriptorSets(device, &descriptorCreateInfo, out _descriptorSet).ThrowOnError();
+
+                var descriptorBufferInfo = new DescriptorBufferInfo
+                {
+                    Buffer = _uniformBuffer,
+                    Range = (ulong)Unsafe.SizeOf<UniformBuffer>(),
+                };
+                var descriptorWrite = new WriteDescriptorSet
+                {
+                    SType = StructureType.WriteDescriptorSet,
+                    DstSet = _descriptorSet,
+                    DescriptorType = DescriptorType.UniformBuffer,
+                    DescriptorCount = 1,
+                    PBufferInfo = &descriptorBufferInfo,
+                };
+                api.UpdateDescriptorSets(device, 1, &descriptorWrite, 0, null);
+                
+                var constants = new[] { vertexPushConstantRange, fragPushConstantRange };
+
+                fixed (PushConstantRange* constant = constants)
+                {
+                    var setLayout = _descriptorSetLayout;
+                    var pipelineLayoutCreateInfo = new PipelineLayoutCreateInfo()
+                    {
+                        SType = StructureType.PipelineLayoutCreateInfo,
+                        PushConstantRangeCount = (uint)constants.Length,
+                        PPushConstantRanges = constant,
+                        SetLayoutCount = 1,
+                        PSetLayouts = &setLayout
+                    };
+
+                    api.CreatePipelineLayout(device, pipelineLayoutCreateInfo, null, out _pipelineLayout)
+                        .ThrowOnError();
+                }
+
+
+                fixed (PipelineShaderStageCreateInfo* stPtr = stages)
+                {
+                    var pipelineCreateInfo = new GraphicsPipelineCreateInfo()
+                    {
+                        SType = StructureType.GraphicsPipelineCreateInfo,
+                        StageCount = 2,
+                        PStages = stPtr,
+                        PVertexInputState = &vertextInputInfo,
+                        PInputAssemblyState = &inputAssembly,
+                        PViewportState = &pipelineViewPortCreateInfo,
+                        PRasterizationState = &rasterizerStateCreateInfo,
+                        PMultisampleState = &multisampleStateCreateInfo,
+                        PDepthStencilState = &depthStencilCreateInfo,
+                        PColorBlendState = &colorBlendState,
+                        PDynamicState = &dynamicStateCreateInfo,
+                        Layout = _pipelineLayout,
+                        RenderPass = _renderPass,
+                        Subpass = 0,
+                        BasePipelineHandle = _pipeline.Handle != 0 ? _pipeline : new Pipeline(),
+                        BasePipelineIndex = _pipeline.Handle != 0 ? 0 : -1
+                    };
+
+                    api.CreateGraphicsPipelines(device, new PipelineCache(), 1, &pipelineCreateInfo, null,
+                        out _pipeline).ThrowOnError();
+                }
+            }
+        }
+
+        Marshal.FreeHGlobal(pname);
+        _isInit = true;
+    }
+
+    private unsafe void CreateBuffers()
+    {
+        VulkanBufferHelper.AllocateBuffer<Vertex>(_context, BufferUsageFlags.VertexBufferBit, out _vertexBuffer,
+            out _vertexBufferMemory, _points);
+        VulkanBufferHelper.AllocateBuffer<ushort>(_context, BufferUsageFlags.IndexBufferBit, out _indexBuffer,
+            out _indexBufferMemory, _indices);
+    }
+
+    private static int FindSuitableMemoryTypeIndex(Vk api, PhysicalDevice physicalDevice, uint memoryTypeBits,
+        MemoryPropertyFlags flags)
+    {
+        api.GetPhysicalDeviceMemoryProperties(physicalDevice, out var properties);
+
+        for (var i = 0; i < properties.MemoryTypeCount; i++)
+        {
+            var type = properties.MemoryTypes[i];
+
+            if ((memoryTypeBits & (1 << i)) != 0 && type.PropertyFlags.HasFlag(flags)) return i;
+        }
+
+        return -1;
+    }
+
+
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    private struct Vertex
+    {
+        public Vector3 Position;
+        public Vector3 Normal;
+
+        public static unsafe VertexInputBindingDescription VertexInputBindingDescription
+        {
+            get
+            {
+                return new VertexInputBindingDescription()
+                {
+                    Binding = 0,
+                    Stride = (uint)Marshal.SizeOf<Vertex>(),
+                    InputRate = VertexInputRate.Vertex
+                };
+            }
+        }
+
+        public static unsafe VertexInputAttributeDescription[] VertexInputAttributeDescription
+        {
+            get
+            {
+                return new VertexInputAttributeDescription[]
+                {
+                    new VertexInputAttributeDescription
+                    {
+                        Binding = 0,
+                        Location = 0,
+                        Format = Format.R32G32B32Sfloat,
+                        Offset = (uint)Marshal.OffsetOf<Vertex>("Position")
+                    },
+                    new VertexInputAttributeDescription
+                    {
+                        Binding = 0,
+                        Location = 1,
+                        Format = Format.R32G32B32Sfloat,
+                        Offset = (uint)Marshal.OffsetOf<Vertex>("Normal")
+                    }
+                };
+            }
+        }
+    }
+
+    private readonly Vertex[] _points;
+    private readonly ushort[] _indices;
+    private readonly float _minY;
+    private readonly float _maxY;
+
+
+    static Stopwatch St = Stopwatch.StartNew();
+    private bool _isInit;
+    private VulkanImage _colorAttachment;
+    private DescriptorSet _descriptorSet;
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    private struct VertextPushConstant
+    {
+        public float MaxY;
+        public float MinY;
+        public float Time;
+        public float Disco;
+        public Matrix4x4 Model;
+    }
+    
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    private struct UniformBuffer
+    {
+        public Matrix4x4 Projection;
+    }
+}
diff --git a/samples/GpuInterop/VulkanDemo/VulkanContext.cs b/samples/GpuInterop/VulkanDemo/VulkanContext.cs
new file mode 100644
index 0000000000..56041d6965
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanContext.cs
@@ -0,0 +1,335 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using Avalonia.Vulkan;
+using Silk.NET.Core;
+using Silk.NET.Core.Native;
+using Silk.NET.Vulkan;
+using Silk.NET.Vulkan.Extensions.EXT;
+using Silk.NET.Vulkan.Extensions.KHR;
+using SilkNetDemo;
+using SkiaSharp;
+using D3DDevice = SharpDX.Direct3D11.Device;
+using DxgiDevice = SharpDX.DXGI.Device;
+
+namespace GpuInterop.VulkanDemo;
+
+public unsafe class VulkanContext : IDisposable
+{
+    public Vk Api { get; init; }
+    public Instance Instance { get; init; }
+    public PhysicalDevice PhysicalDevice { get; init; }
+    public Device Device { get; init; }
+    public Queue Queue { get; init; }
+    public uint QueueFamilyIndex { get; init; }
+    public VulkanCommandBufferPool Pool { get; init; }
+    public GRContext GrContext { get; init; }
+    public DescriptorPool DescriptorPool { get; init; }
+    public D3DDevice? D3DDevice { get; init; }
+
+    public static (VulkanContext? result, string info) TryCreate(ICompositionGpuInterop gpuInterop)
+    {
+        using var appName = new ByteString("GpuInterop");
+        using var engineName = new ByteString("Test");
+        var applicationInfo = new ApplicationInfo
+        {
+            SType = StructureType.ApplicationInfo,
+            PApplicationName = appName,
+            ApiVersion = new Version32(1, 1, 0),
+            PEngineName = appName,
+            EngineVersion = new Version32(1, 0, 0),
+            ApplicationVersion = new Version32(1, 0, 0)
+        };
+
+        var enabledExtensions = new List<string>()
+        {
+            "VK_KHR_get_physical_device_properties2",
+            "VK_KHR_external_memory_capabilities",
+            "VK_KHR_external_semaphore_capabilities"
+        };
+
+        var enabledLayers = new List<string>();
+        
+        Vk api = Vk.GetApi();
+        enabledExtensions.Add("VK_EXT_debug_utils");
+        if (IsLayerAvailable(api, "VK_LAYER_KHRONOS_validation"))
+            enabledLayers.Add("VK_LAYER_KHRONOS_validation");
+        
+
+        Instance vkInstance = default;
+        Silk.NET.Vulkan.PhysicalDevice physicalDevice = default;
+        Device device = default;
+        DescriptorPool descriptorPool = default;
+        VulkanCommandBufferPool? pool = null;
+        GRContext? grContext = null;
+        try
+        {
+            using var pRequiredExtensions = new ByteStringList(enabledExtensions);
+            using var pEnabledLayers = new ByteStringList(enabledLayers);
+            api.CreateInstance(new InstanceCreateInfo
+            {
+                SType = StructureType.InstanceCreateInfo,
+                PApplicationInfo = &applicationInfo,
+                PpEnabledExtensionNames = pRequiredExtensions,
+                EnabledExtensionCount = pRequiredExtensions.UCount,
+                PpEnabledLayerNames = pEnabledLayers,
+                EnabledLayerCount = pEnabledLayers.UCount
+            }, null, out vkInstance).ThrowOnError();
+
+
+            if (api.TryGetInstanceExtension(vkInstance, out ExtDebugUtils debugUtils))
+            {
+                var debugCreateInfo = new DebugUtilsMessengerCreateInfoEXT
+                {
+                    SType = StructureType.DebugUtilsMessengerCreateInfoExt,
+                    MessageSeverity = DebugUtilsMessageSeverityFlagsEXT.DebugUtilsMessageSeverityVerboseBitExt |
+                                      DebugUtilsMessageSeverityFlagsEXT.DebugUtilsMessageSeverityWarningBitExt |
+                                      DebugUtilsMessageSeverityFlagsEXT.DebugUtilsMessageSeverityErrorBitExt,
+                    MessageType = DebugUtilsMessageTypeFlagsEXT.DebugUtilsMessageTypeGeneralBitExt |
+                                  DebugUtilsMessageTypeFlagsEXT.DebugUtilsMessageTypeValidationBitExt |
+                                  DebugUtilsMessageTypeFlagsEXT.DebugUtilsMessageTypePerformanceBitExt,
+                    PfnUserCallback = new PfnDebugUtilsMessengerCallbackEXT(LogCallback),
+                };
+
+                debugUtils.CreateDebugUtilsMessenger(vkInstance, debugCreateInfo, null, out var messenger);
+            }
+
+            var requireDeviceExtensions = new List<string>
+            {
+                "VK_KHR_external_memory",
+                "VK_KHR_external_semaphore"
+            };
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                if (!gpuInterop.SupportedImageHandleTypes.Contains(KnownPlatformGraphicsExternalImageHandleTypes
+                        .D3D11TextureGlobalSharedHandle)
+                   )
+                    return (null, "Image sharing is not supported by the current backend");
+                requireDeviceExtensions.Add(KhrExternalMemoryWin32.ExtensionName);
+                requireDeviceExtensions.Add(KhrExternalSemaphoreWin32.ExtensionName);
+                requireDeviceExtensions.Add("VK_KHR_dedicated_allocation");
+                requireDeviceExtensions.Add("VK_KHR_get_memory_requirements2");
+            }
+            else
+            {
+                if (!gpuInterop.SupportedImageHandleTypes.Contains(KnownPlatformGraphicsExternalImageHandleTypes
+                        .VulkanOpaquePosixFileDescriptor)
+                    || !gpuInterop.SupportedSemaphoreTypes.Contains(KnownPlatformGraphicsExternalSemaphoreHandleTypes
+                        .VulkanOpaquePosixFileDescriptor)
+                   )
+                    return (null, "Image sharing is not supported by the current backend");
+                requireDeviceExtensions.Add(KhrExternalMemoryFd.ExtensionName);
+                requireDeviceExtensions.Add(KhrExternalSemaphoreFd.ExtensionName);
+            }
+
+            uint count = 0;
+            api.EnumeratePhysicalDevices(vkInstance, ref count, null).ThrowOnError();
+            var physicalDevices = stackalloc PhysicalDevice[(int)count];
+            api.EnumeratePhysicalDevices(vkInstance, ref count, physicalDevices)
+                .ThrowOnError();
+
+            for (uint c = 0; c < count; c++)
+            {
+                if (requireDeviceExtensions.Any(ext => !api.IsDeviceExtensionPresent(physicalDevices[c], ext)))
+                    continue;
+
+                var physicalDeviceIDProperties = new PhysicalDeviceIDProperties()
+                {
+                    SType = StructureType.PhysicalDeviceIDProperties
+                };
+                var physicalDeviceProperties2 = new PhysicalDeviceProperties2()
+                {
+                    SType = StructureType.PhysicalDeviceProperties2,
+                    PNext = &physicalDeviceIDProperties
+                };
+                api.GetPhysicalDeviceProperties2(physicalDevices[c], &physicalDeviceProperties2);
+
+                if (gpuInterop.DeviceLuid != null && physicalDeviceIDProperties.DeviceLuidvalid)
+                {
+                    if (!new Span<byte>(physicalDeviceIDProperties.DeviceLuid, 8)
+                            .SequenceEqual(gpuInterop.DeviceLuid))
+                        continue;
+                }
+                else if (gpuInterop.DeviceUuid != null)
+                {
+                    if (!new Span<byte>(physicalDeviceIDProperties.DeviceUuid, 16)
+                            .SequenceEqual(gpuInterop?.DeviceUuid))
+                        continue;
+                }
+
+                physicalDevice = physicalDevices[c];
+
+                var name = Marshal.PtrToStringAnsi(new IntPtr(physicalDeviceProperties2.Properties.DeviceName))!;
+
+
+                uint queueFamilyCount = 0;
+                api.GetPhysicalDeviceQueueFamilyProperties(physicalDevice, ref queueFamilyCount, null);
+                var familyProperties = stackalloc QueueFamilyProperties[(int)queueFamilyCount];
+                api.GetPhysicalDeviceQueueFamilyProperties(physicalDevice, ref queueFamilyCount, familyProperties);
+                for (uint queueFamilyIndex = 0; queueFamilyIndex < queueFamilyCount; queueFamilyIndex++)
+                {
+                    var family = familyProperties[c];
+                    if (!family.QueueFlags.HasAllFlags(QueueFlags.GraphicsBit))
+                        continue;
+
+
+                    var queuePriorities = stackalloc float[(int)family.QueueCount];
+
+                    for (var i = 0; i < family.QueueCount; i++)
+                        queuePriorities[i] = 1f;
+
+                    var features = new PhysicalDeviceFeatures();
+
+                    var queueCreateInfo = new DeviceQueueCreateInfo
+                    {
+                        SType = StructureType.DeviceQueueCreateInfo,
+                        QueueFamilyIndex = queueFamilyIndex,
+                        QueueCount = family.QueueCount,
+                        PQueuePriorities = queuePriorities
+                    };
+
+                    using var pEnabledDeviceExtensions = new ByteStringList(requireDeviceExtensions);
+                    var deviceCreateInfo = new DeviceCreateInfo
+                    {
+                        SType = StructureType.DeviceCreateInfo,
+                        QueueCreateInfoCount = 1,
+                        PQueueCreateInfos = &queueCreateInfo,
+                        PpEnabledExtensionNames = pEnabledDeviceExtensions,
+                        EnabledExtensionCount = pEnabledDeviceExtensions.UCount,
+                        PEnabledFeatures = &features
+                    };
+
+                    api.CreateDevice(physicalDevice, in deviceCreateInfo, null, out device)
+                        .ThrowOnError();
+
+                    api.GetDeviceQueue(device, queueFamilyIndex, 0, out var queue);
+
+                    var descriptorPoolSize = new DescriptorPoolSize
+                    {
+                        Type = DescriptorType.UniformBuffer, DescriptorCount = 16
+                    };
+                    var descriptorPoolInfo = new DescriptorPoolCreateInfo
+                    {
+                        SType = StructureType.DescriptorPoolCreateInfo,
+                        PoolSizeCount = 1,
+                        PPoolSizes = &descriptorPoolSize,
+                        MaxSets = 16,
+                        Flags = DescriptorPoolCreateFlags.FreeDescriptorSetBit
+                    };
+                    
+                    api.CreateDescriptorPool(device, &descriptorPoolInfo, null, out descriptorPool)
+                        .ThrowOnError();
+
+                    pool = new VulkanCommandBufferPool(api, device, queue, queueFamilyIndex);
+                    grContext = GRContext.CreateVulkan(new GRVkBackendContext
+                    {
+                        VkInstance = vkInstance.Handle,
+                        VkDevice = device.Handle,
+                        VkQueue = queue.Handle,
+                        GraphicsQueueIndex = queueFamilyIndex,
+                        VkPhysicalDevice = physicalDevice.Handle,
+                        GetProcedureAddress = (proc, _, _) =>
+                        {
+                            var rv = api.GetDeviceProcAddr(device, proc);
+                            if (rv != IntPtr.Zero)
+                                return rv;
+                            rv = api.GetInstanceProcAddr(vkInstance, proc);
+                            if (rv != IntPtr.Zero)
+                                return rv;
+                            return api.GetInstanceProcAddr(default, proc);
+                        }
+                    });
+                    
+
+                    D3DDevice? d3dDevice = null;
+                    if (physicalDeviceIDProperties.DeviceLuidvalid &&
+                        RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                        d3dDevice = D3DMemoryHelper.CreateDeviceByLuid(
+                            new Span<byte>(physicalDeviceIDProperties.DeviceLuid, 8));
+                    
+                    var dxgiDevice = d3dDevice?.QueryInterface<DxgiDevice>();
+                    return (new VulkanContext
+                    {
+                        Api = api,
+                        Device = device,
+                        Instance = vkInstance,
+                        PhysicalDevice = physicalDevice,
+                        Queue = queue,
+                        QueueFamilyIndex = queueFamilyIndex,
+                        Pool = pool,
+                        DescriptorPool = descriptorPool,
+                        GrContext = grContext,
+                        D3DDevice = d3dDevice
+                    }, name);
+                }
+                return (null, "No suitable device queue found");
+            }
+
+            return (null, "Suitable device not found");
+
+        }
+        catch (Exception e)
+        {
+            return (null, e.ToString());
+        }
+        finally
+        {
+            if (grContext == null && api != null)
+            {
+                pool?.Dispose();
+                if (descriptorPool.Handle != default)
+                    api.DestroyDescriptorPool(device, descriptorPool, null);
+                if (device.Handle != default)
+                    api.DestroyDevice(device, null);
+            }
+        }
+    }
+
+    private static unsafe bool IsLayerAvailable(Vk api, string layerName)
+    {
+        uint layerPropertiesCount;
+
+        api.EnumerateInstanceLayerProperties(&layerPropertiesCount, null).ThrowOnError();
+
+        var layerProperties = new LayerProperties[layerPropertiesCount];
+
+        fixed (LayerProperties* pLayerProperties = layerProperties)
+        {
+            api.EnumerateInstanceLayerProperties(&layerPropertiesCount, layerProperties).ThrowOnError();
+
+            for (var i = 0; i < layerPropertiesCount; i++)
+            {
+                var currentLayerName = Marshal.PtrToStringAnsi((IntPtr)pLayerProperties[i].LayerName);
+
+                if (currentLayerName == layerName) return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static unsafe uint LogCallback(DebugUtilsMessageSeverityFlagsEXT messageSeverity, DebugUtilsMessageTypeFlagsEXT messageTypes, DebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData)
+    {
+        if (messageSeverity != DebugUtilsMessageSeverityFlagsEXT.VerboseBitExt)
+        {
+            var message = Marshal.PtrToStringAnsi((nint)pCallbackData->PMessage);
+            Console.WriteLine(message);
+        }
+
+        return Vk.False;
+    }
+    
+    public void Dispose()
+    {
+        D3DDevice?.Dispose();
+        GrContext.Dispose();
+        Pool.Dispose();
+        Api.DestroyDescriptorPool(Device, DescriptorPool, null);
+        Api.DestroyDevice(Device, null);
+    }
+}
diff --git a/samples/GpuInterop/VulkanDemo/VulkanDemoControl.cs b/samples/GpuInterop/VulkanDemo/VulkanDemoControl.cs
new file mode 100644
index 0000000000..6a1cd641b3
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanDemoControl.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using Silk.NET.Core;
+using Silk.NET.Vulkan;
+using Silk.NET.Vulkan.Extensions.KHR;
+using SilkNetDemo;
+
+namespace GpuInterop.VulkanDemo;
+
+public class VulkanDemoControl : DrawingSurfaceDemoBase
+{
+    private Instance _vkInstance;
+    private Vk _api;
+
+    class VulkanResources : IAsyncDisposable
+    {
+        public VulkanContext Context { get; }
+        public VulkanSwapchain Swapchain { get; }
+        public VulkanContent Content { get; }
+
+        public VulkanResources(VulkanContext context, VulkanSwapchain swapchain, VulkanContent content)
+        {
+            Context = context;
+            Swapchain = swapchain;
+            Content = content;
+        }
+        public async ValueTask DisposeAsync()
+        {
+            Context.Pool.FreeUsedCommandBuffers();
+            Content.Dispose();
+            await Swapchain.DisposeAsync();
+            Context.Dispose();
+        }
+    }
+
+    protected override bool SupportsDisco => true;
+
+    private VulkanResources? _resources;
+
+    protected override (bool success, string info) InitializeGraphicsResources(Compositor compositor,
+        CompositionDrawingSurface compositionDrawingSurface, ICompositionGpuInterop gpuInterop)
+    {
+        var (context, info) = VulkanContext.TryCreate(gpuInterop);
+        if (context == null)
+            return (false, info);
+        try
+        {
+            var content = new VulkanContent(context);
+            _resources = new VulkanResources(context,
+                new VulkanSwapchain(context, gpuInterop, compositionDrawingSurface), content);
+            return (true, info);
+        }
+        catch(Exception e)
+        {
+            return (false, e.ToString());
+        }
+    }
+
+    protected override void FreeGraphicsResources()
+    {
+        _resources?.DisposeAsync();
+        _resources = null;
+    }
+
+    protected override unsafe void RenderFrame(PixelSize pixelSize)
+    {
+        if (_resources == null)
+            return;
+        using (_resources.Swapchain.BeginDraw(pixelSize, out var image))
+        {
+            /*
+            var commandBuffer = _resources.Context.Pool.CreateCommandBuffer();
+            commandBuffer.BeginRecording();
+            image.TransitionLayout(commandBuffer.InternalHandle, ImageLayout.TransferDstOptimal, AccessFlags.None);
+
+            var range = new ImageSubresourceRange
+            {
+                AspectMask = ImageAspectFlags.ColorBit,
+                LayerCount = 1,
+                LevelCount = 1,
+                BaseArrayLayer = 0,
+                BaseMipLevel = 0
+            };
+            var color = new ClearColorValue
+            {
+                Float32_0 = 1, Float32_1 = 0, Float32_2 = 0, Float32_3 = 1
+            };
+            _resources.Context.Api.CmdClearColorImage(commandBuffer.InternalHandle, image.InternalHandle.Value, ImageLayout.TransferDstOptimal,
+                &color, 1, &range);
+            commandBuffer.Submit();*/
+            _resources.Content.Render(image, Yaw, Pitch, Roll, Disco);
+        }
+    }
+}
diff --git a/samples/GpuInterop/VulkanDemo/VulkanExtensions.cs b/samples/GpuInterop/VulkanDemo/VulkanExtensions.cs
new file mode 100644
index 0000000000..1a13ebd4c5
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+using Silk.NET.Vulkan;
+
+namespace SilkNetDemo;
+
+public static class VulkanExtensions
+{
+    public static void ThrowOnError(this Result result)
+    {
+        if (result != Result.Success) throw new Exception($"Unexpected API error \"{result}\".");
+    }
+}
\ No newline at end of file
diff --git a/samples/GpuInterop/VulkanDemo/VulkanImage.cs b/samples/GpuInterop/VulkanDemo/VulkanImage.cs
new file mode 100644
index 0000000000..e8854bfeb2
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanImage.cs
@@ -0,0 +1,276 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Vulkan;
+using Silk.NET.Vulkan;
+using Silk.NET.Vulkan.Extensions.KHR;
+using SilkNetDemo;
+using SkiaSharp;
+
+namespace GpuInterop.VulkanDemo;
+
+public unsafe class VulkanImage : IDisposable
+    {
+        private readonly VulkanContext _vk;
+        private readonly Instance _instance;
+        private readonly Device _device;
+        private readonly PhysicalDevice _physicalDevice;
+        private readonly VulkanCommandBufferPool _commandBufferPool;
+        private ImageLayout _currentLayout;
+        private AccessFlags _currentAccessFlags;
+        private ImageUsageFlags _imageUsageFlags { get; }
+        private ImageView? _imageView { get; set; }
+        private DeviceMemory _imageMemory { get; set; }
+        private SharpDX.Direct3D11.Texture2D? _d3dTexture2D;
+        private IntPtr _win32ShareHandle;
+        
+        internal Image? InternalHandle { get; private set; }
+        internal Format Format { get; }
+        internal ImageAspectFlags AspectFlags { get; private set; }
+        
+        public ulong Handle => InternalHandle?.Handle ?? 0;
+        public ulong ViewHandle => _imageView?.Handle ?? 0;
+        public uint UsageFlags => (uint) _imageUsageFlags;
+        public ulong MemoryHandle => _imageMemory.Handle;
+        public DeviceMemory DeviceMemory => _imageMemory;
+        public uint MipLevels { get; private set; }
+        public Vk Api { get; }
+        public PixelSize Size { get; }
+        public ulong MemorySize { get; private set; }
+        public uint CurrentLayout => (uint) _currentLayout;
+
+        public VulkanImage(VulkanContext vk, uint format, PixelSize size,
+            bool exportable, uint mipLevels = 0)
+        {
+            _vk = vk;
+            _instance = vk.Instance;
+            _device = vk.Device;
+            _physicalDevice = vk.PhysicalDevice;
+            _commandBufferPool = vk.Pool;
+            Format = (Format)format;
+            Api = vk.Api;
+            Size = size;
+            MipLevels = 1;//mipLevels;
+            _imageUsageFlags =
+                ImageUsageFlags.ImageUsageColorAttachmentBit | ImageUsageFlags.ImageUsageTransferDstBit |
+                ImageUsageFlags.ImageUsageTransferSrcBit | ImageUsageFlags.ImageUsageSampledBit;
+            
+            //MipLevels = MipLevels != 0 ? MipLevels : (uint)Math.Floor(Math.Log(Math.Max(Size.Width, Size.Height), 2));
+
+            var handleType = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+                ExternalMemoryHandleTypeFlags.D3D11TextureKmtBit :
+                ExternalMemoryHandleTypeFlags.OpaqueFDBit;
+            var externalMemoryCreateInfo = new ExternalMemoryImageCreateInfo
+            {
+                SType = StructureType.ExternalMemoryImageCreateInfo,
+                HandleTypes = handleType
+            };
+            
+            var imageCreateInfo = new ImageCreateInfo
+            {
+                PNext = exportable ? &externalMemoryCreateInfo : null,
+                SType = StructureType.ImageCreateInfo,
+                ImageType = ImageType.ImageType2D,
+                Format = Format,
+                Extent =
+                    new Extent3D((uint?)Size.Width,
+                        (uint?)Size.Height, 1),
+                MipLevels = MipLevels,
+                ArrayLayers = 1,
+                Samples = SampleCountFlags.SampleCount1Bit,
+                Tiling = Tiling,
+                Usage = _imageUsageFlags,
+                SharingMode = SharingMode.Exclusive,
+                InitialLayout = ImageLayout.Undefined,
+                Flags = ImageCreateFlags.ImageCreateMutableFormatBit
+            };
+
+            Api
+                .CreateImage(_device, imageCreateInfo, null, out var image).ThrowOnError();
+            InternalHandle = image;
+            
+            Api.GetImageMemoryRequirements(_device, InternalHandle.Value,
+                out var memoryRequirements);
+
+
+            var fdExport = new ExportMemoryAllocateInfo
+            {
+                HandleTypes = handleType, SType = StructureType.ExportMemoryAllocateInfo
+            };
+            var dedicatedAllocation = new MemoryDedicatedAllocateInfoKHR
+            {
+                SType = StructureType.MemoryDedicatedAllocateInfoKhr,
+                Image = image
+            };
+            ImportMemoryWin32HandleInfoKHR handleImport = default;
+            if (exportable && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                 _d3dTexture2D = D3DMemoryHelper.CreateMemoryHandle(vk.D3DDevice, size, Format);
+                 using var dxgi = _d3dTexture2D.QueryInterface<SharpDX.DXGI.Resource>();
+                 _win32ShareHandle = dxgi.SharedHandle;
+                 handleImport = new ImportMemoryWin32HandleInfoKHR
+                 {
+                     PNext = &dedicatedAllocation,
+                     SType = StructureType.ImportMemoryWin32HandleInfoKhr,
+                     HandleType = ExternalMemoryHandleTypeFlags.D3D11TextureKmtBit,
+                     Handle = _win32ShareHandle,
+                 };
+            }
+
+            var memoryAllocateInfo = new MemoryAllocateInfo
+            {
+                PNext =
+                    exportable ? RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? &handleImport : &fdExport : null,
+                SType = StructureType.MemoryAllocateInfo,
+                AllocationSize = memoryRequirements.Size,
+                MemoryTypeIndex = (uint)VulkanMemoryHelper.FindSuitableMemoryTypeIndex(
+                    Api,
+                    _physicalDevice,
+                    memoryRequirements.MemoryTypeBits, MemoryPropertyFlags.MemoryPropertyDeviceLocalBit)
+            };
+
+            Api.AllocateMemory(_device, memoryAllocateInfo, null,
+                out var imageMemory).ThrowOnError();
+
+            _imageMemory = imageMemory;
+            
+            
+            MemorySize = memoryRequirements.Size;
+
+            Api.BindImageMemory(_device, InternalHandle.Value, _imageMemory, 0).ThrowOnError();
+            var componentMapping = new ComponentMapping(
+                ComponentSwizzle.Identity,
+                ComponentSwizzle.Identity,
+                ComponentSwizzle.Identity,
+                ComponentSwizzle.Identity);
+
+            AspectFlags = ImageAspectFlags.ImageAspectColorBit;
+
+            var subresourceRange = new ImageSubresourceRange(AspectFlags, 0, MipLevels, 0, 1);
+
+            var imageViewCreateInfo = new ImageViewCreateInfo
+            {
+                SType = StructureType.ImageViewCreateInfo,
+                Image = InternalHandle.Value,
+                ViewType = ImageViewType.ImageViewType2D,
+                Format = Format,
+                Components = componentMapping,
+                SubresourceRange = subresourceRange
+            };
+
+            Api
+                .CreateImageView(_device, imageViewCreateInfo, null, out var imageView)
+                .ThrowOnError();
+
+            _imageView = imageView;
+
+            _currentLayout = ImageLayout.Undefined;
+
+            TransitionLayout(ImageLayout.ColorAttachmentOptimal, AccessFlags.AccessNoneKhr);
+        }
+
+        public int ExportFd()
+        {
+            if (!Api.TryGetDeviceExtension<KhrExternalMemoryFd>(_instance, _device, out var ext))
+                throw new InvalidOperationException();
+            var info = new MemoryGetFdInfoKHR
+            {
+                Memory = _imageMemory,
+                SType = StructureType.MemoryGetFDInfoKhr,
+                HandleType = ExternalMemoryHandleTypeFlags.OpaqueFDBit
+            };
+            ext.GetMemoryF(_device, info, out var fd).ThrowOnError();
+            return fd;
+        }
+        
+        public IPlatformHandle Export() => RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+            new PlatformHandle(_win32ShareHandle,
+                KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle) :
+            new PlatformHandle(new IntPtr(ExportFd()),
+                KnownPlatformGraphicsExternalImageHandleTypes.VulkanOpaquePosixFileDescriptor);
+
+        public ImageTiling Tiling => ImageTiling.Optimal;
+
+        
+        
+        internal void TransitionLayout(CommandBuffer commandBuffer,
+            ImageLayout fromLayout, AccessFlags fromAccessFlags,
+            ImageLayout destinationLayout, AccessFlags destinationAccessFlags)
+        {
+            VulkanMemoryHelper.TransitionLayout(Api, commandBuffer, InternalHandle.Value,
+                fromLayout,
+                fromAccessFlags,
+                destinationLayout, destinationAccessFlags,
+                MipLevels);
+            
+            _currentLayout = destinationLayout;
+            _currentAccessFlags = destinationAccessFlags;
+        }
+
+        internal void TransitionLayout(CommandBuffer commandBuffer,
+            ImageLayout destinationLayout, AccessFlags destinationAccessFlags)
+            => TransitionLayout(commandBuffer, _currentLayout, _currentAccessFlags, destinationLayout,
+                destinationAccessFlags);
+        
+        
+        internal void TransitionLayout(ImageLayout destinationLayout, AccessFlags destinationAccessFlags)
+        {
+            var commandBuffer = _commandBufferPool.CreateCommandBuffer();
+            commandBuffer.BeginRecording();
+            TransitionLayout(commandBuffer.InternalHandle, destinationLayout, destinationAccessFlags);
+            commandBuffer.EndRecording();
+            commandBuffer.Submit();
+        }
+
+        public void TransitionLayout(uint destinationLayout, uint destinationAccessFlags)
+        {
+            TransitionLayout((ImageLayout)destinationLayout, (AccessFlags)destinationAccessFlags);
+        }
+
+        public unsafe void Dispose()
+        {
+            Api.DestroyImageView(_device, _imageView.Value, null);
+            Api.DestroyImage(_device, InternalHandle.Value, null);
+            Api.FreeMemory(_device, _imageMemory, null);
+
+            _imageView = default;
+            InternalHandle = default;
+            _imageMemory = default;
+        }
+
+        public void SaveTexture(string path)
+        {
+            _vk.GrContext.ResetContext();
+            var _image = this;
+            var imageInfo = new GRVkImageInfo()
+            {
+                CurrentQueueFamily = _vk.QueueFamilyIndex,
+                Format = (uint)_image.Format,
+                Image = _image.Handle,
+                ImageLayout = (uint)_image.CurrentLayout,
+                ImageTiling = (uint)_image.Tiling,
+                ImageUsageFlags = (uint)_image.UsageFlags,
+                LevelCount = _image.MipLevels,
+                SampleCount = 1,
+                Protected = false,
+                Alloc = new GRVkAlloc()
+                {
+                    Memory = _image.MemoryHandle, Flags = 0, Offset = 0, Size = _image.MemorySize
+                }
+            };
+
+            using (var backendTexture = new GRBackendRenderTarget(_image.Size.Width, _image.Size.Height, 1,
+                       imageInfo))
+            using (var surface = SKSurface.Create(_vk.GrContext, backendTexture,
+                       GRSurfaceOrigin.TopLeft,
+                       SKColorType.Rgba8888, SKColorSpace.CreateSrgb()))
+            {
+                using var snap = surface.Snapshot();
+                using var encoded = snap.Encode();
+                using (var s = File.Create(path))
+                    encoded.SaveTo(s);
+            }
+        }
+    }
diff --git a/samples/GpuInterop/VulkanDemo/VulkanMemoryHelper.cs b/samples/GpuInterop/VulkanDemo/VulkanMemoryHelper.cs
new file mode 100644
index 0000000000..f6778610dc
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanMemoryHelper.cs
@@ -0,0 +1,59 @@
+using Silk.NET.Vulkan;
+
+namespace GpuInterop.VulkanDemo;
+
+internal static class VulkanMemoryHelper
+{
+    internal static int FindSuitableMemoryTypeIndex(Vk api, PhysicalDevice physicalDevice, uint memoryTypeBits,
+        MemoryPropertyFlags flags)
+    {
+        api.GetPhysicalDeviceMemoryProperties(physicalDevice, out var properties);
+
+        for (var i = 0; i < properties.MemoryTypeCount; i++)
+        {
+            var type = properties.MemoryTypes[i];
+
+            if ((memoryTypeBits & (1 << i)) != 0 && type.PropertyFlags.HasFlag(flags)) return i;
+        }
+
+        return -1;
+    }
+
+    internal static unsafe void TransitionLayout(
+        Vk api,
+        CommandBuffer commandBuffer,
+        Image image,
+        ImageLayout sourceLayout,
+        AccessFlags sourceAccessMask,
+        ImageLayout destinationLayout,
+        AccessFlags destinationAccessMask,
+        uint mipLevels)
+    {
+        var subresourceRange = new ImageSubresourceRange(ImageAspectFlags.ImageAspectColorBit, 0, mipLevels, 0, 1);
+
+        var barrier = new ImageMemoryBarrier
+        {
+            SType = StructureType.ImageMemoryBarrier,
+            SrcAccessMask = sourceAccessMask,
+            DstAccessMask = destinationAccessMask,
+            OldLayout = sourceLayout,
+            NewLayout = destinationLayout,
+            SrcQueueFamilyIndex = Vk.QueueFamilyIgnored,
+            DstQueueFamilyIndex = Vk.QueueFamilyIgnored,
+            Image = image,
+            SubresourceRange = subresourceRange
+        };
+
+        api.CmdPipelineBarrier(
+            commandBuffer,
+            PipelineStageFlags.PipelineStageAllCommandsBit,
+            PipelineStageFlags.PipelineStageAllCommandsBit,
+            0,
+            0,
+            null,
+            0,
+            null,
+            1,
+            barrier);
+    }
+}
\ No newline at end of file
diff --git a/samples/GpuInterop/VulkanDemo/VulkanSemaphorePair.cs b/samples/GpuInterop/VulkanDemo/VulkanSemaphorePair.cs
new file mode 100644
index 0000000000..279c313a27
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanSemaphorePair.cs
@@ -0,0 +1,58 @@
+using System;
+using Silk.NET.Vulkan;
+using Silk.NET.Vulkan.Extensions.KHR;
+using SilkNetDemo;
+
+namespace GpuInterop.VulkanDemo;
+
+class VulkanSemaphorePair : IDisposable
+{
+    private readonly VulkanContext _resources;
+
+    public unsafe VulkanSemaphorePair(VulkanContext resources, bool exportable)
+    {
+        _resources = resources;
+
+        var semaphoreExportInfo = new ExportSemaphoreCreateInfo
+        {
+            SType = StructureType.ExportSemaphoreCreateInfo,
+            HandleTypes = ExternalSemaphoreHandleTypeFlags.OpaqueFDBit
+        };
+
+        var semaphoreCreateInfo = new SemaphoreCreateInfo
+        {
+            SType = StructureType.SemaphoreCreateInfo,
+            PNext = exportable ? &semaphoreExportInfo : null
+        };
+
+        resources.Api.CreateSemaphore(resources.Device, semaphoreCreateInfo, null, out var semaphore).ThrowOnError();
+        ImageAvailableSemaphore = semaphore;
+
+        resources.Api.CreateSemaphore(resources.Device, semaphoreCreateInfo, null, out semaphore).ThrowOnError();
+        RenderFinishedSemaphore = semaphore;
+    }
+
+    public int ExportFd(bool renderFinished)
+    {
+        if (!_resources.Api.TryGetDeviceExtension<KhrExternalSemaphoreFd>(_resources.Instance, _resources.Device,
+                out var ext))
+            throw new InvalidOperationException();
+        var info = new SemaphoreGetFdInfoKHR()
+        {
+            SType = StructureType.SemaphoreGetFDInfoKhr,
+            Semaphore = renderFinished ? RenderFinishedSemaphore : ImageAvailableSemaphore,
+            HandleType = ExternalSemaphoreHandleTypeFlags.OpaqueFDBit
+        };
+        ext.GetSemaphoreF(_resources.Device, info, out var fd).ThrowOnError();
+        return fd;
+    }
+
+    internal Semaphore ImageAvailableSemaphore { get; }
+    internal Semaphore RenderFinishedSemaphore { get; }
+
+    public unsafe void Dispose()
+    {
+        _resources.Api.DestroySemaphore(_resources.Device, ImageAvailableSemaphore, null);
+        _resources.Api.DestroySemaphore(_resources.Device, RenderFinishedSemaphore, null);
+    }
+}
\ No newline at end of file
diff --git a/samples/GpuInterop/VulkanDemo/VulkanSwapchain.cs b/samples/GpuInterop/VulkanDemo/VulkanSwapchain.cs
new file mode 100644
index 0000000000..325c815ccb
--- /dev/null
+++ b/samples/GpuInterop/VulkanDemo/VulkanSwapchain.cs
@@ -0,0 +1,154 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Avalonia.Vulkan;
+using Metsys.Bson;
+using Silk.NET.Vulkan;
+using SkiaSharp;
+
+namespace GpuInterop.VulkanDemo;
+
+class VulkanSwapchain : SwapchainBase<VulkanSwapchainImage>
+{
+    private readonly VulkanContext _vk;
+
+    public VulkanSwapchain(VulkanContext vk, ICompositionGpuInterop interop, CompositionDrawingSurface target) : base(interop, target)
+    {
+        _vk = vk;
+    }
+
+    protected override VulkanSwapchainImage CreateImage(PixelSize size)
+    {
+        return new VulkanSwapchainImage(_vk, size, Interop, Target);
+    }
+
+    public IDisposable BeginDraw(PixelSize size, out VulkanImage image)
+    {
+        _vk.Pool.FreeUsedCommandBuffers();
+        var rv = BeginDrawCore(size, out var swapchainImage);
+        image = swapchainImage.Image;
+        return rv;
+    }
+}
+
+class VulkanSwapchainImage : ISwapchainImage
+{
+    private readonly VulkanContext _vk;
+    private readonly ICompositionGpuInterop _interop;
+    private readonly CompositionDrawingSurface _target;
+    private readonly VulkanImage _image;
+    private readonly VulkanSemaphorePair _semaphorePair;
+    private ICompositionImportedGpuSemaphore? _availableSemaphore, _renderCompletedSemaphore;
+    private ICompositionImportedGpuImage? _importedImage;
+    private Task? _lastPresent;
+    public VulkanImage Image => _image;
+    private bool _initial = true;
+
+    public VulkanSwapchainImage(VulkanContext vk, PixelSize size, ICompositionGpuInterop interop, CompositionDrawingSurface target)
+    {
+        _vk = vk;
+        _interop = interop;
+        _target = target;
+        Size = size;
+        _image = new VulkanImage(vk, (uint)Format.R8G8B8A8Unorm, size, true);
+        _semaphorePair = new VulkanSemaphorePair(vk, true);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (LastPresent != null)
+            await LastPresent;
+        if (_importedImage != null)
+            await _importedImage.DisposeAsync();
+        if (_availableSemaphore != null)
+            await _availableSemaphore.DisposeAsync();
+        if (_renderCompletedSemaphore != null)
+            await _renderCompletedSemaphore.DisposeAsync();
+        _semaphorePair.Dispose();
+        _image.Dispose();
+    }
+
+    public PixelSize Size { get; }
+
+    public Task? LastPresent => _lastPresent;
+
+    public void BeginDraw()
+    {
+        var buffer = _vk.Pool.CreateCommandBuffer();
+        buffer.BeginRecording();
+
+        _image.TransitionLayout(buffer.InternalHandle, 
+            ImageLayout.Undefined, AccessFlags.None,
+            ImageLayout.ColorAttachmentOptimal, AccessFlags.AccessColorAttachmentReadBit);
+
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            buffer.Submit(null,null,null, null, new VulkanCommandBufferPool.VulkanCommandBuffer.KeyedMutexSubmitInfo
+            {
+                AcquireKey = 0,
+                DeviceMemory = _image.DeviceMemory
+            });
+        else if (_initial)
+        {
+            _initial = false;
+            buffer.Submit();
+        }
+        else
+            buffer.Submit(new[] { _semaphorePair.ImageAvailableSemaphore },
+                new[]
+                {
+                    PipelineStageFlags.AllGraphicsBit
+                });
+    }
+
+    
+    
+    public void Present()
+    {
+        var buffer = _vk.Pool.CreateCommandBuffer();
+        buffer.BeginRecording();
+        _image.TransitionLayout(buffer.InternalHandle, ImageLayout.TransferSrcOptimal, AccessFlags.TransferWriteBit);
+
+        
+        
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            buffer.Submit(null, null, null, null,
+                new VulkanCommandBufferPool.VulkanCommandBuffer.KeyedMutexSubmitInfo
+                {
+                    DeviceMemory = _image.DeviceMemory, ReleaseKey = 1
+                });
+        }
+        else
+            buffer.Submit(null, null, new[] { _semaphorePair.RenderFinishedSemaphore });
+
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            _availableSemaphore ??= _interop.ImportSemaphore(new PlatformHandle(
+                new IntPtr(_semaphorePair.ExportFd(false)),
+                KnownPlatformGraphicsExternalSemaphoreHandleTypes.VulkanOpaquePosixFileDescriptor));
+            
+            _renderCompletedSemaphore ??= _interop.ImportSemaphore(new PlatformHandle(
+                new IntPtr(_semaphorePair.ExportFd(true)),
+                KnownPlatformGraphicsExternalSemaphoreHandleTypes.VulkanOpaquePosixFileDescriptor));
+        }
+
+        _importedImage ??= _interop.ImportImage(_image.Export(),
+            new PlatformGraphicsExternalImageProperties
+            {
+                Format = PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm,
+                Width = Size.Width,
+                Height = Size.Height,
+                MemorySize = _image.MemorySize
+            });
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            _lastPresent = _target.UpdateWithKeyedMutexAsync(_importedImage, 1, 0);
+        else
+            _lastPresent = _target.UpdateWithSemaphoresAsync(_importedImage, _renderCompletedSemaphore, _availableSemaphore);
+    }
+}
diff --git a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
index c06f5c74ec..247008c503 100644
--- a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
@@ -1,6 +1,8 @@
 using System;
 using Android.App;
 using Android.Content;
+using Android.Content.PM;
+using Android.Content.Res;
 using Android.OS;
 using Android.Runtime;
 using Android.Views;
@@ -13,6 +15,7 @@ namespace Avalonia.Android
         internal static object ViewContent;
 
         public Action<int, Result, Intent> ActivityResult { get; set; }
+        public Action<int, string[], Permission[]> RequestPermissionsResult { get; set; }
         internal AvaloniaView View;
         private GlobalLayoutListener _listener;
 
@@ -82,6 +85,13 @@ namespace Avalonia.Android
             ActivityResult?.Invoke(requestCode, resultCode, data);
         }
 
+        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
+        {
+            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+            
+            RequestPermissionsResult?.Invoke(requestCode, permissions, grantResults);
+        }
+
         class GlobalLayoutListener : Java.Lang.Object, ViewTreeObserver.IOnGlobalLayoutListener
         {
             private AvaloniaView _view;
diff --git a/src/Android/Avalonia.Android/IActivityResultHandler.cs b/src/Android/Avalonia.Android/IActivityResultHandler.cs
index 14094ee185..40a8b5cbcf 100644
--- a/src/Android/Avalonia.Android/IActivityResultHandler.cs
+++ b/src/Android/Avalonia.Android/IActivityResultHandler.cs
@@ -1,11 +1,14 @@
 using System;
 using Android.App;
 using Android.Content;
+using Android.Content.PM;
 
 namespace Avalonia.Android
 {
     public interface IActivityResultHandler
     {
         public Action<int, Result, Intent> ActivityResult { get; set; }
+        
+        public Action<int, string[], Permission[]> RequestPermissionsResult { get; set; }
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/PlatformSupport.cs b/src/Android/Avalonia.Android/Platform/PlatformSupport.cs
new file mode 100644
index 0000000000..9877f48664
--- /dev/null
+++ b/src/Android/Avalonia.Android/Platform/PlatformSupport.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+
+namespace Avalonia.Android.Platform;
+
+internal static class PlatformSupport
+{
+    private static int s_lastRequestCode = 20000;
+
+    public static int GetNextRequestCode() => s_lastRequestCode++;
+
+    public static async Task<bool> CheckPermission(this Activity activity, string permission)
+    {
+        if (activity is not IActivityResultHandler mainActivity)
+        {
+            throw new InvalidOperationException("Main activity must implement IActivityResultHandler interface.");
+        }
+
+        if (!OperatingSystem.IsAndroidVersionAtLeast(23))
+        {
+            return true;
+        }
+
+        if (activity.CheckSelfPermission(permission) == Permission.Granted)
+        {
+            return true;
+        }
+        
+        var currentRequestCode = GetNextRequestCode();
+        var tcs = new TaskCompletionSource<bool>();
+        mainActivity.RequestPermissionsResult += RequestPermissionsResult;
+        activity.RequestPermissions(new [] { permission }, currentRequestCode);
+
+        return await tcs.Task;
+        
+        void RequestPermissionsResult(int requestCode, string[] arg2, Permission[] arg3)
+        {
+            if (currentRequestCode != requestCode)
+            {
+                return;
+            }
+
+            mainActivity.RequestPermissionsResult -= RequestPermissionsResult;
+
+            _ = tcs.TrySetResult(arg3.All(p => p == Permission.Granted));
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
index 078f70db60..9838bb06c8 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -2,10 +2,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Android;
+using Android.App;
 using Android.Content;
 using Android.Provider;
 using Avalonia.Logging;
@@ -19,41 +20,48 @@ namespace Avalonia.Android.Platform.Storage;
 
 internal abstract class AndroidStorageItem : IStorageBookmarkItem
 {
-    private Context? _context;
+    private Activity? _activity;
+    private readonly bool _needsExternalFilesPermission;
 
-    protected AndroidStorageItem(Context context, AndroidUri uri)
+    protected AndroidStorageItem(Activity activity, AndroidUri uri, bool needsExternalFilesPermission)
     {
-        _context = context;
+        _activity = activity;
+        _needsExternalFilesPermission = needsExternalFilesPermission;
         Uri = uri;
     }
 
     internal AndroidUri Uri { get; }
+    
+    protected Activity Activity => _activity ?? throw new ObjectDisposedException(nameof(AndroidStorageItem));
 
-    protected Context Context => _context ?? throw new ObjectDisposedException(nameof(AndroidStorageItem));
-
-    public string Name => GetColumnValue(Context, Uri, MediaStore.IMediaColumns.DisplayName)
+    public virtual string Name => GetColumnValue(Activity, Uri, MediaStore.IMediaColumns.DisplayName)
                           ?? Uri.PathSegments?.LastOrDefault() ?? string.Empty;
 
+    public Uri Path => new(Uri.ToString()!);
+
     public bool CanBookmark => true;
 
-    public Task<string?> SaveBookmarkAsync()
+    public async Task<string?> SaveBookmarkAsync()
     {
-        Context.ContentResolver?.TakePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
-        return Task.FromResult(Uri.ToString());
-    }
+        if (!await EnsureExternalFilesPermission(false))
+        {
+            return null;
+        }
 
-    public Task ReleaseBookmarkAsync()
-    {
-        Context.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
-        return Task.CompletedTask;
+        Activity.ContentResolver?.TakePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
+        return Uri.ToString();
     }
 
-    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
+    public async Task ReleaseBookmarkAsync()
     {
-        uri = new Uri(Uri.ToString()!);
-        return true;
-    }
+        if (!await EnsureExternalFilesPermission(false))
+        {
+            return;
+        }
 
+        Activity.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
+    }
+    
     public abstract Task<StorageItemProperties> GetBasicPropertiesAsync();
 
     protected string? GetColumnValue(Context context, AndroidUri contentUri, string column, string? selection = null, string[]? selectionArgs = null)
@@ -77,29 +85,44 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
         return null;
     }
 
-    public Task<IStorageFolder?> GetParentAsync()
+    public async Task<IStorageFolder?> GetParentAsync()
     {
+        if (!await EnsureExternalFilesPermission(false))
+        {
+            return null;
+        }
+
         using var javaFile = new JavaFile(Uri.Path!);
 
         // Java file represents files AND directories. Don't be confused.
         if (javaFile.ParentFile is {} parentFile
             && AndroidUri.FromFile(parentFile) is {} androidUri)
         {
-            return Task.FromResult<IStorageFolder?>(new AndroidStorageFolder(Context, androidUri));
+            return new AndroidStorageFolder(Activity, androidUri, false);
         }
 
-        return Task.FromResult<IStorageFolder?>(null);
+        return null;
     }
 
+    protected async Task<bool> EnsureExternalFilesPermission(bool write)
+    {
+        if (!_needsExternalFilesPermission)
+        {
+            return true;
+        }
+
+        return await _activity.CheckPermission(Manifest.Permission.ReadExternalStorage);
+    }
+    
     public void Dispose()
     {
-        _context = null;
+        _activity = null;
     }
 }
 
-internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
+internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
 {
-    public AndroidStorageFolder(Context context, AndroidUri uri) : base(context, uri)
+    public AndroidStorageFolder(Activity activity, AndroidUri uri, bool needsExternalFilesPermission) : base(activity, uri, needsExternalFilesPermission)
     {
     }
 
@@ -110,6 +133,11 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
 
     public async Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
     {
+        if (!await EnsureExternalFilesPermission(false))
+        {
+            return Array.Empty<IStorageItem>();
+        }
+
         using var javaFile = new JavaFile(Uri.Path!);
 
         // Java file represents files AND directories. Don't be confused.
@@ -124,8 +152,8 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
             .Where(t => t.uri is not null)
             .Select(t => t.file switch
             {
-                { IsFile: true } => (IStorageItem)new AndroidStorageFile(Context, t.uri!),
-                { IsDirectory: true } => new AndroidStorageFolder(Context, t.uri!),
+                { IsFile: true } => (IStorageItem)new AndroidStorageFile(Activity, t.uri!),
+                { IsDirectory: true } => new AndroidStorageFolder(Activity, t.uri!, false),
                 _ => null
             })
             .Where(i => i is not null)
@@ -133,9 +161,20 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
     }
 }
 
+internal sealed class WellKnownAndroidStorageFolder : AndroidStorageFolder
+{
+    public WellKnownAndroidStorageFolder(Activity activity, string identifier, AndroidUri uri, bool needsExternalFilesPermission)
+        : base(activity, uri, needsExternalFilesPermission)
+    {
+        Name = identifier;
+    }
+
+    public override string Name { get; }
+} 
+
 internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkFile
 {
-    public AndroidStorageFile(Context context, AndroidUri uri) : base(context, uri)
+    public AndroidStorageFile(Activity activity, AndroidUri uri) : base(activity, uri, false)
     {
     }
 
@@ -143,10 +182,10 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
 
     public bool CanOpenWrite => true;
 
-    public Task<Stream> OpenReadAsync() => Task.FromResult(OpenContentStream(Context, Uri, false)
+    public Task<Stream> OpenReadAsync() => Task.FromResult(OpenContentStream(Activity, Uri, false)
         ?? throw new InvalidOperationException("Failed to open content stream"));
 
-    public Task<Stream> OpenWriteAsync() => Task.FromResult(OpenContentStream(Context, Uri, true)
+    public Task<Stream> OpenWriteAsync() => Task.FromResult(OpenContentStream(Activity, Uri, true)
         ?? throw new InvalidOperationException("Failed to open content stream"));
 
     private Stream? OpenContentStream(Context context, AndroidUri uri, bool isOutput)
@@ -210,7 +249,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
                 MediaStore.IMediaColumns.Size, MediaStore.IMediaColumns.DateAdded,
                 MediaStore.IMediaColumns.DateModified
             };
-            using var cursor = Context.ContentResolver!.Query(Uri, projection, null, null, null);
+            using var cursor = Activity.ContentResolver!.Query(Uri, projection, null, null, null);
 
             if (cursor?.MoveToFirst() == true)
             {
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
index 62e43ff2ef..f611f50164 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs
@@ -4,18 +4,21 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Android;
 using Android.App;
 using Android.Content;
 using Android.Provider;
 using Avalonia.Platform.Storage;
+using Java.Lang;
 using AndroidUri = Android.Net.Uri;
+using Exception = System.Exception;
+using JavaFile = Java.IO.File;
 
 namespace Avalonia.Android.Platform.Storage;
 
 internal class AndroidStorageProvider : IStorageProvider
 {
     private readonly Activity _activity;
-    private int _lastRequestCode = 20000;
 
     public AndroidStorageProvider(Activity activity)
     {
@@ -31,7 +34,108 @@ internal class AndroidStorageProvider : IStorageProvider
     public Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark)
     {
         var uri = AndroidUri.Parse(bookmark) ?? throw new ArgumentException("Couldn't parse Bookmark value", nameof(bookmark));
-        return Task.FromResult<IStorageBookmarkFolder?>(new AndroidStorageFolder(_activity, uri));
+        return Task.FromResult<IStorageBookmarkFolder?>(new AndroidStorageFolder(_activity, uri, false));
+    }
+
+    public async Task<IStorageFile?> TryGetFileFromPath(Uri filePath)
+    {
+        if (filePath is null)
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+
+        if (filePath is not { IsAbsoluteUri: true, Scheme: "file" or "content" })
+        {
+            throw new ArgumentException("File path is expected to be an absolute link with \"file\" or \"content\" scheme.");
+        }
+
+        var androidUri = AndroidUri.Parse(filePath.ToString());
+        if (androidUri?.Path is not {} androidUriPath)
+        {
+            return null;
+        }
+
+        var hasPerms = await _activity.CheckPermission(Manifest.Permission.ReadExternalStorage);
+        if (!hasPerms)
+        {
+            throw new SecurityException("Application doesn't have ReadExternalStorage permission. Make sure android manifest has this permission defined and user allowed it.");
+        }
+        
+        var javaFile = new JavaFile(androidUriPath);
+        if (javaFile.Exists() && javaFile.IsFile)
+        {
+            return null;
+        }
+
+        return new AndroidStorageFile(_activity, androidUri);
+    }
+
+    public async Task<IStorageFolder?> TryGetFolderFromPath(Uri folderPath)
+    {
+        if (folderPath is null)
+        {
+            throw new ArgumentNullException(nameof(folderPath));
+        }
+
+        if (folderPath is not { IsAbsoluteUri: true, Scheme: "file" or "content" })
+        {
+            throw new ArgumentException("Folder path is expected to be an absolute link with \"file\" or \"content\" scheme.");
+        }
+
+        var androidUri = AndroidUri.Parse(folderPath.ToString());
+        if (androidUri?.Path is not {} androidUriPath)
+        {
+            return null;
+        }
+
+        var hasPerms = await _activity.CheckPermission(Manifest.Permission.ReadExternalStorage);
+        if (!hasPerms)
+        {
+            throw new SecurityException("Application doesn't have ReadExternalStorage permission. Make sure android manifest has this permission defined and user allowed it.");
+        }
+
+        var javaFile = new JavaFile(androidUriPath);
+        if (javaFile.Exists() && javaFile.IsDirectory)
+        {
+            return null;
+        }
+
+        return new AndroidStorageFolder(_activity, androidUri, false);
+    }
+
+    public Task<IStorageFolder?> TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+    {
+        var dirCode = wellKnownFolder switch
+        {
+            WellKnownFolder.Desktop => null,
+            WellKnownFolder.Documents => global::Android.OS.Environment.DirectoryDocuments,
+            WellKnownFolder.Downloads => global::Android.OS.Environment.DirectoryDownloads,
+            WellKnownFolder.Music => global::Android.OS.Environment.DirectoryMusic,
+            WellKnownFolder.Pictures => global::Android.OS.Environment.DirectoryPictures,
+            WellKnownFolder.Videos => global::Android.OS.Environment.DirectoryMovies,
+            _ => throw new ArgumentOutOfRangeException(nameof(wellKnownFolder), wellKnownFolder, null)
+        };
+        if (dirCode is null)
+        {
+            return Task.FromResult<IStorageFolder?>(null);
+        }
+
+        var dir = _activity.GetExternalFilesDir(dirCode);
+        if (dir is null || !dir.Exists())
+        {
+            return Task.FromResult<IStorageFolder?>(null);
+        }
+
+        var uri = AndroidUri.FromFile(dir);
+        if (uri is null)
+        {
+            return Task.FromResult<IStorageFolder?>(null);
+        }
+
+        // To make TryGetWellKnownFolder API easier to use, we don't check for the permissions.
+        // It will work with file picker activities, but it will fail on any direct access to the folder, like getting list of children.
+        // We pass "needsExternalFilesPermission" parameter here, so folder itself can check for permissions on any FS access. 
+        return Task.FromResult<IStorageFolder?>(new WellKnownAndroidStorageFolder(_activity, dirCode, uri, true));
     }
 
     public Task<IStorageBookmarkFile?> OpenFileBookmarkAsync(string bookmark)
@@ -110,19 +214,21 @@ internal class AndroidStorageProvider : IStorageProvider
         var pickerIntent = Intent.CreateChooser(intent, options.Title ?? "Select folder");
 
         var uris = await StartActivity(pickerIntent, false);
-        return uris.Select(u => new AndroidStorageFolder(_activity, u)).ToArray();
+        return uris.Select(u => new AndroidStorageFolder(_activity, u, false)).ToArray();
     }
 
     private async Task<List<AndroidUri>> StartActivity(Intent? pickerIntent, bool singleResult)
     {
         var resultList = new List<AndroidUri>(1);
         var tcs = new TaskCompletionSource<Intent?>();
-        var currentRequestCode = _lastRequestCode++;
+        var currentRequestCode = PlatformSupport.GetNextRequestCode();
 
-        if (_activity is IActivityResultHandler mainActivity)
+        if (!(_activity is IActivityResultHandler mainActivity))
         {
-            mainActivity.ActivityResult += OnActivityResult;
+            throw new InvalidOperationException("Main activity must implement IActivityResultHandler interface.");
         }
+
+        mainActivity.ActivityResult += OnActivityResult;
         _activity.StartActivityForResult(pickerIntent, currentRequestCode);
 
         var result = await tcs.Task;
@@ -161,11 +267,7 @@ internal class AndroidStorageProvider : IStorageProvider
                 return;
             }
 
-
-            if (_activity is IActivityResultHandler mainActivity)
-            {
-                mainActivity.ActivityResult -= OnActivityResult;
-            }
+            mainActivity.ActivityResult -= OnActivityResult;
 
             _ = tcs.TrySetResult(resultCode == Result.Ok ? data : null);
         }
diff --git a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
index 068c190fa1..801f247754 100644
--- a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
+using Avalonia.Media.Transformation;
 
 #nullable enable
 
@@ -30,7 +31,7 @@ namespace Avalonia.Animation.Animators
                     return new ImmutableRadialGradientBrush(
                         InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
                         s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        InterpolateTransform(progress, oldValue.Transform, newValue.Transform),
                         s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
                         oldValue.SpreadMethod,
                         s_relativePointAnimator.Interpolate(progress, oldRadial.Center, newRadial.Center),
@@ -41,7 +42,7 @@ namespace Avalonia.Animation.Animators
                     return new ImmutableConicGradientBrush(
                         InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
                         s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        InterpolateTransform(progress, oldValue.Transform, newValue.Transform),
                         s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
                         oldValue.SpreadMethod,
                         s_relativePointAnimator.Interpolate(progress, oldConic.Center, newConic.Center),
@@ -51,7 +52,7 @@ namespace Avalonia.Animation.Animators
                     return new ImmutableLinearGradientBrush(
                         InterpolateStops(progress, oldValue.GradientStops, newValue.GradientStops),
                         s_doubleAnimator.Interpolate(progress, oldValue.Opacity, newValue.Opacity),
-                        oldValue.Transform is { } ? new ImmutableTransform(oldValue.Transform.Value) : null,
+                        InterpolateTransform(progress, oldValue.Transform, newValue.Transform),
                         s_relativePointAnimator.Interpolate(progress, oldValue.TransformOrigin, newValue.TransformOrigin),
                         oldValue.SpreadMethod,
                         s_relativePointAnimator.Interpolate(progress, oldLinear.StartPoint, newLinear.StartPoint),
@@ -72,6 +73,25 @@ namespace Avalonia.Animation.Animators
             return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
         }
 
+        private static ImmutableTransform? InterpolateTransform(double progress,
+            ITransform? oldTransform, ITransform? newTransform)
+        {
+            if (oldTransform is TransformOperations oldTransformOperations
+                && newTransform is TransformOperations newTransformOperations)
+            {
+
+                return new ImmutableTransform(TransformOperations
+                    .Interpolate(oldTransformOperations, newTransformOperations, progress).Value);
+            }
+
+            if (oldTransform is not null)
+            {
+                return new ImmutableTransform(oldTransform.Value);
+            }
+            
+            return null;
+        }
+    
         private static IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
         {
             var resultCount = Math.Max(oldValue.Count, newValue.Count);
diff --git a/src/Avalonia.Base/AttachedProperty.cs b/src/Avalonia.Base/AttachedProperty.cs
index a43194153c..31b6cad8ab 100644
--- a/src/Avalonia.Base/AttachedProperty.cs
+++ b/src/Avalonia.Base/AttachedProperty.cs
@@ -24,11 +24,9 @@ namespace Avalonia
             Func<TValue, bool>? validate = null)
             : base(name, ownerType, metadata, inherits, validate)
         {
+            IsAttached = true;
         }
 
-        /// <inheritdoc/>
-        public override bool IsAttached => true;
-
         /// <summary>
         /// Attaches the property as a non-attached property on the specified type.
         /// </summary>
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index cd122a8b67..35a453ce59 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -30,6 +30,7 @@
     <InternalsVisibleTo Include="Avalonia.Desktop, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Benchmarks, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Controls, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Direct2D1, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup.Xaml, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.OpenGL, PublicKey=$(AvaloniaPublicKey)" />
@@ -47,6 +48,9 @@
     <InternalsVisibleTo Include="Avalonia.DesignerSupport, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.LeakTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Markup.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup.Xaml.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Skia.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index dc94dfba40..1946d4ba5c 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -132,7 +132,7 @@ namespace Avalonia
 
             switch (property)
             {
-                case StyledPropertyBase<T> styled:
+                case StyledProperty<T> styled:
                     ClearValue(styled);
                     break;
                 case DirectPropertyBase<T> direct:
@@ -147,7 +147,7 @@ namespace Avalonia
         /// Clears a <see cref="AvaloniaProperty"/>'s local value.
         /// </summary>
         /// <param name="property">The property.</param>
-        public void ClearValue<T>(StyledPropertyBase<T> property)
+        public void ClearValue<T>(StyledProperty<T> property)
         {
             property = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
@@ -220,7 +220,7 @@ namespace Avalonia
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <returns>The value.</returns>
-        public T GetValue<T>(StyledPropertyBase<T> property)
+        public T GetValue<T>(StyledProperty<T> property)
         {
             _ = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
@@ -243,7 +243,7 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        public Optional<T> GetBaseValue<T>(StyledPropertyBase<T> property)
+        public Optional<T> GetBaseValue<T>(StyledProperty<T> property)
         {
             _ = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
@@ -309,7 +309,7 @@ namespace Avalonia
         /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
         /// </returns>
         public IDisposable? SetValue<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             T value,
             BindingPriority priority = BindingPriority.LocalValue)
         {
@@ -373,7 +373,7 @@ namespace Avalonia
         /// A disposable which can be used to terminate the binding.
         /// </returns>
         public IDisposable Bind<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<object?> source,
             BindingPriority priority = BindingPriority.LocalValue)
         {
@@ -396,7 +396,7 @@ namespace Avalonia
         /// A disposable which can be used to terminate the binding.
         /// </returns>
         public IDisposable Bind<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<T> source,
             BindingPriority priority = BindingPriority.LocalValue)
         {
@@ -419,7 +419,7 @@ namespace Avalonia
         /// A disposable which can be used to terminate the binding.
         /// </returns>
         public IDisposable Bind<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<BindingValue<T>> source,
             BindingPriority priority = BindingPriority.LocalValue)
         {
diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index 7b17b9152d..6231483ff8 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -146,7 +146,7 @@ namespace Avalonia
 
             return property switch
             {
-                StyledPropertyBase<T> styled => target.Bind(styled, source, priority),
+                StyledProperty<T> styled => target.Bind(styled, source, priority),
                 DirectPropertyBase<T> direct => target.Bind(direct, source),
                 _ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
             };
@@ -170,7 +170,7 @@ namespace Avalonia
         {
             return property switch
             {
-                StyledPropertyBase<T> styled => target.Bind(styled, source, priority),
+                StyledProperty<T> styled => target.Bind(styled, source, priority),
                 DirectPropertyBase<T> direct => target.Bind(direct, source),
                 _ => throw new NotSupportedException("Unsupported AvaloniaProperty type."),
             };
@@ -231,7 +231,7 @@ namespace Avalonia
 
             return property switch
             {
-                StyledPropertyBase<T> styled => target.GetValue(styled),
+                StyledProperty<T> styled => target.GetValue(styled),
                 DirectPropertyBase<T> direct => target.GetValue(direct),
                 _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
             };
@@ -280,7 +280,7 @@ namespace Avalonia
 
             return property switch
             {
-                StyledPropertyBase<T> styled => target.GetBaseValue(styled),
+                StyledProperty<T> styled => target.GetBaseValue(styled),
                 DirectPropertyBase<T> direct => target.GetValue(direct),
                 _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
             };
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index e0782c51a2..5db4d81f03 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -107,22 +107,22 @@ namespace Avalonia
         /// <summary>
         /// Gets a value indicating whether the property inherits its value.
         /// </summary>
-        public virtual bool Inherits => false;
+        public bool Inherits { get; private protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this is an attached property.
         /// </summary>
-        public virtual bool IsAttached => false;
+        public bool IsAttached { get; private protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this is a direct property.
         /// </summary>
-        public virtual bool IsDirect => false;
+        public bool IsDirect { get; private protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this is a readonly property.
         /// </summary>
-        public virtual bool IsReadOnly => false;
+        public bool IsReadOnly { get; private protected set; }
 
         /// <summary>
         /// Gets an observable that is fired when this property changes on any
diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index 0b737dd959..e53ae40cb1 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -41,54 +41,41 @@ namespace Avalonia.Data
             {
                 case BindingMode.Default:
                 case BindingMode.OneWay:
-                    if (binding.Observable is null)
-                        throw new InvalidOperationException("InstancedBinding does not contain an observable.");
-                    return target.Bind(property, binding.Observable, binding.Priority);
+                    return target.Bind(property, binding.Source, binding.Priority);
                 case BindingMode.TwoWay:
-                    if (binding.Observable is null)
-                        throw new InvalidOperationException("InstancedBinding does not contain an observable.");
-                    if (binding.Subject is null)
+                {
+                    if (binding.Source is not IObserver<object?> observer)
                         throw new InvalidOperationException("InstancedBinding does not contain a subject.");
                     return new TwoWayBindingDisposable(
-                        target.Bind(property, binding.Observable, binding.Priority),
-                        target.GetObservable(property).Subscribe(binding.Subject));
+                        target.Bind(property, binding.Source, binding.Priority),
+                        target.GetObservable(property).Subscribe(observer));
+                }
                 case BindingMode.OneTime:
-                    if (binding.Observable is {} source)
-                    {
-                        // Perf: Avoid allocating closure in the outer scope.
-                        var targetCopy = target;
-                        var propertyCopy = property;
-                        var bindingCopy = binding;
-
-                        return source
-                            .Where(x => BindingNotification.ExtractValue(x) != AvaloniaProperty.UnsetValue)
-                            .Take(1)
-                            .Subscribe(x => targetCopy.SetValue(
-                                propertyCopy,
-                                BindingNotification.ExtractValue(x),
-                                bindingCopy.Priority));
-                    }
-                    else
-                    {
-                        target.SetValue(property, binding.Value, binding.Priority);
-                        return Disposable.Empty;
-                    }
+                {
+                    // Perf: Avoid allocating closure in the outer scope.
+                    var targetCopy = target;
+                    var propertyCopy = property;
+                    var bindingCopy = binding;
+
+                    return binding.Source
+                        .Where(x => BindingNotification.ExtractValue(x) != AvaloniaProperty.UnsetValue)
+                        .Take(1)
+                        .Subscribe(x => targetCopy.SetValue(
+                            propertyCopy,
+                            BindingNotification.ExtractValue(x),
+                            bindingCopy.Priority));
+                }
 
                 case BindingMode.OneWayToSource:
                 {
-                    if (binding.Observable is null)
-                        throw new InvalidOperationException("InstancedBinding does not contain an observable.");
-                    if (binding.Subject is null)
+                    if (binding.Source is not IObserver<object?> observer)
                         throw new InvalidOperationException("InstancedBinding does not contain a subject.");
 
-                    // Perf: Avoid allocating closure in the outer scope.
-                    var bindingCopy = binding;
-
                     return Observable.CombineLatest(
-                        binding.Observable,
+                        binding.Source,
                         target.GetObservable(property),
                         (_, v) => v)
-                    .Subscribe(x => bindingCopy.Subject.OnNext(x));
+                    .Subscribe(x => observer.OnNext(x));
                 }
 
                 default:
diff --git a/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs
index 536c14dcf9..92fc843394 100644
--- a/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs
+++ b/src/Avalonia.Base/Data/Core/AvaloniaPropertyAccessorNode.cs
@@ -3,7 +3,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Data.Core
 {
-    public class AvaloniaPropertyAccessorNode : SettableNode
+    internal class AvaloniaPropertyAccessorNode : SettableNode
     {
         private IDisposable? _subscription;
         private readonly bool _enableValidation;
diff --git a/src/Avalonia.Base/Data/Core/BindingExpression.cs b/src/Avalonia.Base/Data/Core/BindingExpression.cs
index 55caf8070e..79942cb9ce 100644
--- a/src/Avalonia.Base/Data/Core/BindingExpression.cs
+++ b/src/Avalonia.Base/Data/Core/BindingExpression.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Data.Core
     /// that are sent and received.
     /// </summary>
     [RequiresUnreferencedCode(TrimmingMessages.TypeConvertionRequiresUnreferencedCodeMessage)]
-    public class BindingExpression : LightweightObservableBase<object?>, IAvaloniaSubject<object?>, IDescription
+    internal class BindingExpression : LightweightObservableBase<object?>, IAvaloniaSubject<object?>, IDescription
     {
         private readonly ExpressionObserver _inner;
         private readonly Type _targetType;
diff --git a/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
index 4e142fbee9..b333fa9047 100644
--- a/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
@@ -1,6 +1,6 @@
 namespace Avalonia.Data.Core
 {
-    public class EmptyExpressionNode : ExpressionNode
+    internal class EmptyExpressionNode : ExpressionNode
     {
         public override string Description => ".";
     }
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
index 5fb2bb5c13..30fc71cfb4 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Avalonia.Data.Core
 {
-    public abstract class ExpressionNode
+    internal abstract class ExpressionNode
     {
         protected static readonly WeakReference<object?> UnsetReference = 
             new WeakReference<object?>(AvaloniaProperty.UnsetValue);
diff --git a/src/Avalonia.Base/Data/Core/ExpressionObserver.cs b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
index 0818b5fa62..ce3549c4ad 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Data.Core
     /// <summary>
     /// Observes and sets the value of an expression on an object.
     /// </summary>
-    public class ExpressionObserver : LightweightObservableBase<object?>, IDescription
+    internal class ExpressionObserver : LightweightObservableBase<object?>, IDescription
     {
         /// <summary>
         /// An ordered collection of property accessor plugins that can be used to customize
diff --git a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
index 2fad96701d..9ec256225b 100644
--- a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
+++ b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
@@ -7,7 +7,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Data.Core
 {
-    public abstract class IndexerNodeBase : SettableNode,
+    internal abstract class IndexerNodeBase : SettableNode,
         IWeakEventSubscriber<NotifyCollectionChangedEventArgs>,
         IWeakEventSubscriber<PropertyChangedEventArgs>
     {
diff --git a/src/Avalonia.Base/Data/Core/LogicalNotNode.cs b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
index 45837db73d..81b07bfe85 100644
--- a/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
+++ b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 
 namespace Avalonia.Data.Core
 {
-    public class LogicalNotNode : ExpressionNode, ITransformNode
+    internal class LogicalNotNode : ExpressionNode, ITransformNode
     {
         public override string Description => "!";
 
diff --git a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
index 34f8e568d4..f111d8917b 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Data.Core.Plugins
     /// <summary>
     /// Reads a property from a <see cref="AvaloniaObject"/>.
     /// </summary>
-    public class AvaloniaPropertyAccessorPlugin : IPropertyAccessorPlugin
+    internal class AvaloniaPropertyAccessorPlugin : IPropertyAccessorPlugin
     {
         /// <inheritdoc/>
         [RequiresUnreferencedCode(TrimmingMessages.PropertyAccessorsRequiresUnreferencedCodeMessage)]
diff --git a/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs b/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
new file mode 100644
index 0000000000..6d88d55774
--- /dev/null
+++ b/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Data.Core.Plugins
+{
+    /// <summary>
+    /// Holds a registry of plugins used for bindings.
+    /// </summary>
+    public static class BindingPlugins
+    {
+        /// <summary>
+        /// An ordered collection of property accessor plugins that can be used to customize
+        /// the reading and subscription of property values on a type.
+        /// </summary>
+        public static IList<IPropertyAccessorPlugin> PropertyAccessors => ExpressionObserver.PropertyAccessors;
+
+        /// <summary>
+        /// An ordered collection of validation checker plugins that can be used to customize
+        /// the validation of view model and model data.
+        /// </summary>
+        public static IList<IDataValidationPlugin> DataValidators => ExpressionObserver.DataValidators;
+
+        /// <summary>
+        /// An ordered collection of stream plugins that can be used to customize the behavior
+        /// of the '^' stream binding operator.
+        /// </summary>
+        public static IList<IStreamPlugin> StreamHandlers => ExpressionObserver.StreamHandlers;
+    }
+}
diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
index bc300386b9..ba5f59ea23 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Data.Core.Plugins
     /// <summary>
     /// Validates properties on that have <see cref="ValidationAttribute"/>s.
     /// </summary>
-    public class DataAnnotationsValidationPlugin : IDataValidationPlugin
+    internal class DataAnnotationsValidationPlugin : IDataValidationPlugin
     {
         /// <inheritdoc/>
         [RequiresUnreferencedCode(TrimmingMessages.DataValidationPluginRequiresUnreferencedCodeMessage)]
diff --git a/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
index 2bb8da2c74..e60a341309 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Data.Core.Plugins
     /// <summary>
     /// Validates properties that report errors by throwing exceptions.
     /// </summary>
-    public class ExceptionValidationPlugin : IDataValidationPlugin
+    internal class ExceptionValidationPlugin : IDataValidationPlugin
     {
         /// <inheritdoc/>
         [RequiresUnreferencedCode(TrimmingMessages.DataValidationPluginRequiresUnreferencedCodeMessage)]
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
index 87a2f67ee8..3384a99333 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Data.Core.Plugins
     /// <summary>
     /// Validates properties on objects that implement <see cref="INotifyDataErrorInfo"/>.
     /// </summary>
-    public class IndeiValidationPlugin : IDataValidationPlugin
+    internal class IndeiValidationPlugin : IDataValidationPlugin
     {
         private static readonly WeakEvent<INotifyDataErrorInfo, DataErrorsChangedEventArgs>
             ErrorsChangedWeakEvent = WeakEvent.Register<INotifyDataErrorInfo, DataErrorsChangedEventArgs>(
diff --git a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index 5b19e995cc..7c2caf02b4 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Data.Core.Plugins
     /// Reads a property from a standard C# object that optionally supports the
     /// <see cref="INotifyPropertyChanged"/> interface.
     /// </summary>
-    public class InpcPropertyAccessorPlugin : IPropertyAccessorPlugin
+    internal class InpcPropertyAccessorPlugin : IPropertyAccessorPlugin
     {
         private readonly Dictionary<(Type, string), PropertyInfo?> _propertyLookup =
             new Dictionary<(Type, string), PropertyInfo?>();
diff --git a/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
index 2397ce483d..8170edd653 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 
 namespace Avalonia.Data.Core.Plugins
 {
-    public class MethodAccessorPlugin : IPropertyAccessorPlugin
+    internal class MethodAccessorPlugin : IPropertyAccessorPlugin
     {
         private readonly Dictionary<(Type, string), MethodInfo?> _methodLookup =
             new Dictionary<(Type, string), MethodInfo?>();
diff --git a/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
index b40628fd35..9cf25281f2 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
@@ -10,12 +10,12 @@ namespace Avalonia.Data.Core.Plugins
     /// Handles binding to <see cref="IObservable{T}"/>s for the '^' stream binding operator.
     /// </summary>
     [UnconditionalSuppressMessage("Trimming", "IL3050", Justification = TrimmingMessages.IgnoreNativeAotSupressWarningMessage)]
-    public class ObservableStreamPlugin : IStreamPlugin
+    internal class ObservableStreamPlugin : IStreamPlugin
     {
         private static MethodInfo? s_observableGeneric;
         private static MethodInfo? s_observableSelect;
 
-        [DynamicDependency(DynamicallyAccessedMemberTypes.NonPublicProperties, "Avalonia.Data.Core.Plugins.ObservableStreamPlugin", "Avalonia.Base")]
+        [DynamicDependency(DynamicallyAccessedMemberTypes.NonPublicMethods, "Avalonia.Data.Core.Plugins.ObservableStreamPlugin", "Avalonia.Base")]
         public ObservableStreamPlugin()
         {
             
diff --git a/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
index 715f4604cf..42a050778e 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Data.Core.Plugins
     /// Handles binding to <see cref="Task"/>s for the '^' stream binding operator.
     /// </summary>
     [UnconditionalSuppressMessage("Trimming", "IL3050", Justification = TrimmingMessages.IgnoreNativeAotSupressWarningMessage)]
-    public class TaskStreamPlugin : IStreamPlugin
+    internal class TaskStreamPlugin : IStreamPlugin
     {
         /// <summary>
         /// Checks whether this plugin handles the specified value.
diff --git a/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
index 1b79fed6e7..3898d232ec 100644
--- a/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
+++ b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
@@ -5,7 +5,7 @@ using Avalonia.Data.Core.Plugins;
 namespace Avalonia.Data.Core
 {
     [RequiresUnreferencedCode(TrimmingMessages.ExpressionNodeRequiresUnreferencedCodeMessage)]
-    public class PropertyAccessorNode : SettableNode
+    internal class PropertyAccessorNode : SettableNode
     {
         private readonly bool _enableValidation;
         private IPropertyAccessorPlugin? _customPlugin;
diff --git a/src/Avalonia.Base/Data/Core/SettableNode.cs b/src/Avalonia.Base/Data/Core/SettableNode.cs
index 9ad9ace814..4980e4487a 100644
--- a/src/Avalonia.Base/Data/Core/SettableNode.cs
+++ b/src/Avalonia.Base/Data/Core/SettableNode.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Data.Core
 {
-    public abstract class SettableNode : ExpressionNode
+    internal abstract class SettableNode : ExpressionNode
     {
         public bool SetTargetValue(object? value, BindingPriority priority)
         {
diff --git a/src/Avalonia.Base/Data/Core/StreamNode.cs b/src/Avalonia.Base/Data/Core/StreamNode.cs
index ba18a2173b..d3da6414ac 100644
--- a/src/Avalonia.Base/Data/Core/StreamNode.cs
+++ b/src/Avalonia.Base/Data/Core/StreamNode.cs
@@ -6,7 +6,7 @@ using Avalonia.Reactive;
 namespace Avalonia.Data.Core
 {
     [RequiresUnreferencedCode(TrimmingMessages.ExpressionNodeRequiresUnreferencedCodeMessage)]
-    public class StreamNode : ExpressionNode
+    internal class StreamNode : ExpressionNode
     {
         private IStreamPlugin? _customPlugin = null;
         private IDisposable? _subscription;
diff --git a/src/Avalonia.Base/Data/Core/TypeCastNode.cs b/src/Avalonia.Base/Data/Core/TypeCastNode.cs
index 3a2ca955fa..655bfbc7a1 100644
--- a/src/Avalonia.Base/Data/Core/TypeCastNode.cs
+++ b/src/Avalonia.Base/Data/Core/TypeCastNode.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace Avalonia.Data.Core
 {
-    public class TypeCastNode : ExpressionNode
+    internal class TypeCastNode : ExpressionNode
     {
         public override string Description => $"as {TargetType.FullName}";
 
diff --git a/src/Avalonia.Base/Data/InstancedBinding.cs b/src/Avalonia.Base/Data/InstancedBinding.cs
index a60c1d72ec..00e5c3d8e6 100644
--- a/src/Avalonia.Base/Data/InstancedBinding.cs
+++ b/src/Avalonia.Base/Data/InstancedBinding.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Reactive;
+using ObservableEx = Avalonia.Reactive.Observable;
 
 namespace Avalonia.Data
 {
@@ -14,11 +15,23 @@ namespace Avalonia.Data
     /// </remarks>
     public class InstancedBinding
     {
-        internal InstancedBinding(object? value, BindingMode mode, BindingPriority priority)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InstancedBinding"/> class.
+        /// </summary>
+        /// <param name="source">The binding source.</param>
+        /// <param name="mode">The binding mode.</param>
+        /// <param name="priority">The priority of the binding.</param>
+        /// <remarks>
+        /// This constructor can be used to create any type of binding and as such requires an
+        /// <see cref="ISubject{Object}"/> as the binding source because this is the only binding
+        /// source which can be used for all binding modes. If you wish to create an instance with
+        /// something other than a subject, use one of the static creation methods on this class.
+        /// </remarks>
+        internal InstancedBinding(IObservable<object?> source, BindingMode mode, BindingPriority priority)
         {
             Mode = mode;
             Priority = priority;
-            Value = value;
+            Source = source ?? throw new ArgumentNullException(nameof(source));
         }
 
         /// <summary>
@@ -32,24 +45,12 @@ namespace Avalonia.Data
         public BindingPriority Priority { get; }
 
         /// <summary>
-        /// Gets the value or source of the binding.
-        /// </summary>
-        public object? Value { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Value"/> as an observable.
+        /// Gets the binding source observable.
         /// </summary>
-        public IObservable<object?>? Observable => Value as IObservable<object?>;
+        public IObservable<object?> Source { get; }
 
-        /// <summary>
-        /// Gets the <see cref="Value"/> as an observer.
-        /// </summary>
-        public IObserver<object?>? Observer => Value as IObserver<object?>;
-
-        /// <summary>
-        /// Gets the <see cref="Subject"/> as an subject.
-        /// </summary>
-        internal IAvaloniaSubject<object?>? Subject => Value as IAvaloniaSubject<object?>;
+        [Obsolete("Use Source property")]
+        public IObservable<object?> Observable => Source;
 
         /// <summary>
         /// Creates a new one-time binding with a fixed value.
@@ -61,7 +62,7 @@ namespace Avalonia.Data
             object value,
             BindingPriority priority = BindingPriority.LocalValue)
         {
-            return new InstancedBinding(value, BindingMode.OneTime, priority);
+            return new InstancedBinding(ObservableEx.SingleValue(value), BindingMode.OneTime, priority);
         }
 
         /// <summary>
@@ -106,7 +107,7 @@ namespace Avalonia.Data
         {
             _ = observer ?? throw new ArgumentNullException(nameof(observer));
 
-            return new InstancedBinding(observer, BindingMode.OneWayToSource, priority);
+            return new InstancedBinding((IObservable<object?>)observer, BindingMode.OneWayToSource, priority);
         }
 
         /// <summary>
@@ -135,7 +136,7 @@ namespace Avalonia.Data
         /// <returns>An <see cref="InstancedBinding"/> instance.</returns>
         public InstancedBinding WithPriority(BindingPriority priority)
         {
-            return new InstancedBinding(Value, Mode, priority);
+            return new InstancedBinding(Source, Mode, priority);
         }
     }
 }
diff --git a/src/Avalonia.Base/DirectProperty.cs b/src/Avalonia.Base/DirectProperty.cs
index 729240e5a1..d02e277074 100644
--- a/src/Avalonia.Base/DirectProperty.cs
+++ b/src/Avalonia.Base/DirectProperty.cs
@@ -33,6 +33,8 @@ namespace Avalonia
         {
             Getter = getter ?? throw new ArgumentNullException(nameof(getter));
             Setter = setter;
+            IsDirect = true;
+            IsReadOnly = setter is null;
         }
 
         /// <summary>
@@ -51,17 +53,10 @@ namespace Avalonia
         {
             Getter = getter ?? throw new ArgumentNullException(nameof(getter));
             Setter = setter;
+            IsDirect = true;
+            IsReadOnly = setter is null;
         }
 
-        /// <inheritdoc/>
-        public override bool IsDirect => true;
-
-        /// <inheritdoc/>
-        public override bool IsReadOnly => Setter == null;
-
-        /// <inheritdoc/>
-        public override Type Owner => typeof(TOwner);
-
         /// <summary>
         /// Gets the getter function.
         /// </summary>
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index ec9eba6d61..9ee1eee0fa 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -1,8 +1,6 @@
 using System;
 using Avalonia.Data;
 using Avalonia.PropertyStore;
-using Avalonia.Reactive;
-using Avalonia.Styling;
 
 namespace Avalonia
 {
@@ -28,6 +26,7 @@ namespace Avalonia
             AvaloniaPropertyMetadata metadata)
             : base(name, ownerType, metadata)
         {
+            Owner = ownerType;
         }
 
         /// <summary>
@@ -42,12 +41,13 @@ namespace Avalonia
             AvaloniaPropertyMetadata metadata)
             : base(source, ownerType, metadata)
         {
+            Owner = ownerType;
         }
 
         /// <summary>
         /// Gets the type that registered the property.
         /// </summary>
-        public abstract Type Owner { get; }
+        public Type Owner { get; }
 
         /// <summary>
         /// Gets the value of the property on the instance.
diff --git a/src/Avalonia.Base/Input/DragEventArgs.cs b/src/Avalonia.Base/Input/DragEventArgs.cs
index 7a27c53023..403dd6f23e 100644
--- a/src/Avalonia.Base/Input/DragEventArgs.cs
+++ b/src/Avalonia.Base/Input/DragEventArgs.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Interactivity;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input
@@ -32,7 +33,9 @@ namespace Avalonia.Input
             return point;
         }
 
-        internal DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
+        [Unstable]
+        [Obsolete("This constructor might be removed in 12.0. For unit testing, consider using DragDrop.DoDragDrop or IHeadlessWindow.DragDrop.")]
+        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
             : base(routedEvent)
         {
             Data = data;
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
index eea7c3b7d1..3b83d0cb87 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/PinchGestureRecognizer.cs
@@ -57,7 +57,10 @@ namespace Avalonia.Input
 
                     var scale = distance / _initialDistance;
 
-                    _target?.RaiseEvent(new PinchEventArgs(scale, _origin));
+                    var pinchEventArgs = new PinchEventArgs(scale, _origin);
+                    _target?.RaiseEvent(pinchEventArgs);
+
+                    e.Handled = pinchEventArgs.Handled;
                 }
             }
         }
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
index 23bab13fc8..991694cc60 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/PullGestureRecognizer.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using Avalonia.Input.GestureRecognizers;
 
 namespace Avalonia.Input
@@ -88,7 +89,10 @@ namespace Avalonia.Input
                 }
 
                 _pullInProgress = true;
-                _target?.RaiseEvent(new PullGestureEventArgs(_gestureId, delta, PullDirection));
+                var pullEventArgs = new PullGestureEventArgs(_gestureId, delta, PullDirection);
+                _target?.RaiseEvent(pullEventArgs);
+
+                e.Handled = pullEventArgs.Handled;
             }
         }
 
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
index 790439245a..7c1ee13eed 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -8,6 +8,10 @@ namespace Avalonia.Input.GestureRecognizers
         : StyledElement, // It's not an "element" in any way, shape or form, but TemplateBinding refuse to work otherwise
             IGestureRecognizer
     {
+        // Pixels per second speed that is considered to be the stop of inertial scroll
+        internal const double InertialScrollSpeedEnd = 5;
+        public const double InertialResistance = 0.15;
+
         private bool _scrolling;
         private Point _trackedRootPoint;
         private IPointer? _tracking;
@@ -23,7 +27,8 @@ namespace Avalonia.Input.GestureRecognizers
         // Movement per second
         private Vector _inertia;
         private ulong? _lastMoveTimestamp;
-        
+        private bool _isScrollInertiaEnabled;
+
         /// <summary>
         /// Defines the <see cref="CanHorizontallyScroll"/> property.
         /// </summary>
@@ -42,6 +47,15 @@ namespace Avalonia.Input.GestureRecognizers
                 o => o.CanVerticallyScroll,
                 (o, v) => o.CanVerticallyScroll = v);
 
+        /// <summary>
+        /// Defines the <see cref="IsScrollInertiaEnabled"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollGestureRecognizer, bool> IsScrollInertiaEnabledProperty =
+            AvaloniaProperty.RegisterDirect<ScrollGestureRecognizer, bool>(
+                nameof(IsScrollInertiaEnabled),
+                o => o.IsScrollInertiaEnabled,
+                (o, v) => o.IsScrollInertiaEnabled = v);
+
         /// <summary>
         /// Defines the <see cref="ScrollStartDistance"/> property.
         /// </summary>
@@ -68,6 +82,15 @@ namespace Avalonia.Input.GestureRecognizers
             get => _canVerticallyScroll;
             set => SetAndRaise(CanVerticallyScrollProperty, ref _canVerticallyScroll, value);
         }
+        
+        /// <summary>
+        /// Gets or sets whether the gesture should include inertia in it's behavior.
+        /// </summary>
+        public bool IsScrollInertiaEnabled
+        {
+            get => _isScrollInertiaEnabled;
+            set => SetAndRaise(IsScrollInertiaEnabledProperty, ref _isScrollInertiaEnabled, value);
+        }
 
         /// <summary>
         /// Gets or sets a value indicating the distance the pointer moves before scrolling is started
@@ -97,9 +120,6 @@ namespace Avalonia.Input.GestureRecognizers
             }
         }
         
-        // Pixels per second speed that is considered to be the stop of inertial scroll
-        private const double InertialScrollSpeedEnd = 5;
-        
         public void PointerMoved(PointerEventArgs e)
         {
             if (e.Pointer == _tracking)
@@ -168,7 +188,8 @@ namespace Avalonia.Input.GestureRecognizers
                 if (_inertia == default
                     || e.Timestamp == 0
                     || _lastMoveTimestamp == 0
-                    || e.Timestamp - _lastMoveTimestamp > 200)
+                    || e.Timestamp - _lastMoveTimestamp > 200
+                    || !IsScrollInertiaEnabled)
                     EndGesture();
                 else
                 {
@@ -176,6 +197,7 @@ namespace Avalonia.Input.GestureRecognizers
                     var savedGestureId = _gestureId;
                     var st = Stopwatch.StartNew();
                     var lastTime = TimeSpan.Zero;
+                    _target!.RaiseEvent(new ScrollGestureInertiaStartingEventArgs(_gestureId, _inertia));
                     DispatcherTimer.Run(() =>
                     {
                         // Another gesture has started, finish the current one
@@ -187,7 +209,7 @@ namespace Avalonia.Input.GestureRecognizers
                         var elapsedSinceLastTick = st.Elapsed - lastTime;
                         lastTime = st.Elapsed;
 
-                        var speed = _inertia * Math.Pow(0.15, st.Elapsed.TotalSeconds);
+                        var speed = _inertia * Math.Pow(InertialResistance, st.Elapsed.TotalSeconds);
                         var distance = speed * elapsedSinceLastTick.TotalSeconds;
                         var scrollGestureEventArgs = new ScrollGestureEventArgs(_gestureId, distance);
                         _target!.RaiseEvent(scrollGestureEventArgs);
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index a9e42c2374..167f61eead 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -45,6 +45,10 @@ namespace Avalonia.Input
             RoutedEvent.Register<ScrollGestureEventArgs>(
                 "ScrollGesture", RoutingStrategies.Bubble, typeof(Gestures));
 
+        public static readonly RoutedEvent<ScrollGestureInertiaStartingEventArgs> ScrollGestureInertiaStartingEvent =
+            RoutedEvent.Register<ScrollGestureInertiaStartingEventArgs>(
+                "ScrollGestureInertiaStarting", RoutingStrategies.Bubble, typeof(Gestures));
+
         public static readonly RoutedEvent<ScrollGestureEndedEventArgs> ScrollGestureEndedEvent =
             RoutedEvent.Register<ScrollGestureEndedEventArgs>(
                 "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
diff --git a/src/Avalonia.Base/Input/GotFocusEventArgs.cs b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
index f3de55ebae..8d15c3f9ec 100644
--- a/src/Avalonia.Base/Input/GotFocusEventArgs.cs
+++ b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
@@ -7,19 +7,18 @@ namespace Avalonia.Input
     /// </summary>
     public class GotFocusEventArgs : RoutedEventArgs
     {
-        internal GotFocusEventArgs()
+        public GotFocusEventArgs() : base(InputElement.GotFocusEvent)
         {
-
         }
 
         /// <summary>
         /// Gets or sets a value indicating how the change in focus occurred.
         /// </summary>
-        public NavigationMethod NavigationMethod { get; set; }
+        public NavigationMethod NavigationMethod { get; init; }
 
         /// <summary>
         /// Gets or sets any key modifiers active at the time of focus.
         /// </summary>
-        public KeyModifiers KeyModifiers { get; set; }
+        public KeyModifiers KeyModifiers { get; init; }
     }
 }
diff --git a/src/Avalonia.Base/Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
index 35fa549995..9fa097c4b1 100644
--- a/src/Avalonia.Base/Input/KeyEventArgs.cs
+++ b/src/Avalonia.Base/Input/KeyEventArgs.cs
@@ -5,15 +5,10 @@ namespace Avalonia.Input
 {
     public class KeyEventArgs : RoutedEventArgs
     {
-        public KeyEventArgs()
-        {
+        public IKeyboardDevice? Device { get; init; }
 
-        }
+        public Key Key { get; init; }
 
-        public IKeyboardDevice? Device { get; set; }
-
-        public Key Key { get; set; }
-
-        public KeyModifiers KeyModifiers { get; set; }
+        public KeyModifiers KeyModifiers { get; init; }
     }
 }
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
index 26ff71a4e7..c46834fff4 100644
--- a/src/Avalonia.Base/Input/KeyboardDevice.cs
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -156,7 +156,6 @@ namespace Avalonia.Input
 
                 interactive?.RaiseEvent(new GotFocusEventArgs
                 {
-                    RoutedEvent = InputElement.GotFocusEvent,
                     NavigationMethod = method,
                     KeyModifiers = keyModifiers,
                 });
diff --git a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
index af0fa83382..c405cdfacd 100644
--- a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
@@ -1,13 +1,17 @@
+using System;
 using Avalonia.Interactivity;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input
 {
     public class PointerDeltaEventArgs : PointerEventArgs
     {
-        public Vector Delta { get; set; }
+        public Vector Delta { get; }
 
-        internal PointerDeltaEventArgs(RoutedEvent routedEvent, object? source, 
+        [Unstable]
+        [Obsolete("This constructor might be removed in 12.0.")]
+        public PointerDeltaEventArgs(RoutedEvent routedEvent, object? source, 
             IPointer pointer, Visual rootVisual, Point rootVisualPosition, ulong timestamp,
             PointerPointProperties properties, KeyModifiers modifiers, Vector delta) 
             : base(routedEvent, source, pointer, rootVisual, rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
index d736253728..502da52597 100644
--- a/src/Avalonia.Base/Input/PointerEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Input.Raw;
 using Avalonia.Interactivity;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input
@@ -13,7 +14,9 @@ namespace Avalonia.Input
         private readonly PointerPointProperties _properties;
         private readonly Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
 
-        internal PointerEventArgs(RoutedEvent routedEvent,
+        [Unstable]
+        [Obsolete("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow mouse methods.")]
+        public PointerEventArgs(RoutedEvent routedEvent,
             object? source,
             IPointer pointer,
             Visual? rootVisual, Point rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
index a3de0eaaea..903019d85d 100644
--- a/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerWheelEventArgs.cs
@@ -1,13 +1,17 @@
+using System;
 using Avalonia.Interactivity;
+using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input
 {
     public class PointerWheelEventArgs : PointerEventArgs
     {
-        public Vector Delta { get; set; }
+        public Vector Delta { get; }
 
-        internal PointerWheelEventArgs(object source, IPointer pointer, Visual rootVisual,
+        [Unstable]
+        [Obsolete("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow.MouseWheel.")]
+        public PointerWheelEventArgs(object source, IPointer pointer, Visual rootVisual,
             Point rootVisualPosition, ulong timestamp,
             PointerPointProperties properties, KeyModifiers modifiers, Vector delta)
             : base(InputElement.PointerWheelChangedEvent, source, pointer, rootVisual, rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
index 48c882197f..cd1cf29bcf 100644
--- a/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
+++ b/src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs
@@ -12,6 +12,6 @@ namespace Avalonia.Input.Raw
             Text = text;
         }
 
-        public string Text { get; set; }
+        public string Text { get; }
     }
 }
diff --git a/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
index f1a0887b60..dd78080708 100644
--- a/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
+++ b/src/Avalonia.Base/Input/ScrollGestureEventArgs.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Input
 
         public static int GetNextFreeId() => _nextId++;
 
-        internal ScrollGestureEventArgs(int id, Vector delta) : base(Gestures.ScrollGestureEvent)
+        public ScrollGestureEventArgs(int id, Vector delta) : base(Gestures.ScrollGestureEvent)
         {
             Id = id;
             Delta = delta;
@@ -25,9 +25,21 @@ namespace Avalonia.Input
     {
         public int Id { get; }
 
-        internal ScrollGestureEndedEventArgs(int id) : base(Gestures.ScrollGestureEndedEvent)
+        public ScrollGestureEndedEventArgs(int id) : base(Gestures.ScrollGestureEndedEvent)
         {
             Id = id;
         }
     }
+
+    public class ScrollGestureInertiaStartingEventArgs : RoutedEventArgs
+    {
+        public int Id { get; }
+        public Vector Inertia { get; }
+
+        internal ScrollGestureInertiaStartingEventArgs(int id, Vector inertia) : base(Gestures.ScrollGestureInertiaStartingEvent)
+        {
+            Id = id;
+            Inertia = inertia;
+        }
+    }
 }
diff --git a/src/Avalonia.Base/Input/TappedEventArgs.cs b/src/Avalonia.Base/Input/TappedEventArgs.cs
index 3e15c4843a..663207a104 100644
--- a/src/Avalonia.Base/Input/TappedEventArgs.cs
+++ b/src/Avalonia.Base/Input/TappedEventArgs.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
@@ -7,7 +8,7 @@ namespace Avalonia.Input
     {
         private readonly PointerEventArgs lastPointerEventArgs;
 
-        internal TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
+        public TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
             : base(routedEvent)
         {
             this.lastPointerEventArgs = lastPointerEventArgs;
diff --git a/src/Avalonia.Base/Input/TextInputEventArgs.cs b/src/Avalonia.Base/Input/TextInputEventArgs.cs
index a027bec0c6..cda0103749 100644
--- a/src/Avalonia.Base/Input/TextInputEventArgs.cs
+++ b/src/Avalonia.Base/Input/TextInputEventArgs.cs
@@ -4,10 +4,6 @@ namespace Avalonia.Input
 {
     public class TextInputEventArgs : RoutedEventArgs
     {
-        public TextInputEventArgs()
-        {
-
-        }
         public IKeyboardDevice? Device { get; set; }
 
         public string? Text { get; set; }
diff --git a/src/Avalonia.Base/Input/VectorEventArgs.cs b/src/Avalonia.Base/Input/VectorEventArgs.cs
index 3e8098f904..2ce95cf35a 100644
--- a/src/Avalonia.Base/Input/VectorEventArgs.cs
+++ b/src/Avalonia.Base/Input/VectorEventArgs.cs
@@ -5,11 +5,6 @@ namespace Avalonia.Input
 {
     public class VectorEventArgs : RoutedEventArgs
     {
-        internal VectorEventArgs()
-        {
-
-        }
-
-        public Vector Vector { get; set; }
+        public Vector Vector { get; init; }
     }
 }
diff --git a/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
index 749d2ecc2b..1cdc775b13 100644
--- a/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
+++ b/src/Avalonia.Base/Layout/EffectiveViewportChangedEventArgs.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Layout
     /// </summary>
     public class EffectiveViewportChangedEventArgs : EventArgs
     {
-        internal EffectiveViewportChangedEventArgs(Rect effectiveViewport)
+        public EffectiveViewportChangedEventArgs(Rect effectiveViewport)
         {
             EffectiveViewport = effectiveViewport;
         }
diff --git a/src/Avalonia.Base/Logging/TraceLogSink.cs b/src/Avalonia.Base/Logging/TraceLogSink.cs
index fc3897fade..a1b4dfe3aa 100644
--- a/src/Avalonia.Base/Logging/TraceLogSink.cs
+++ b/src/Avalonia.Base/Logging/TraceLogSink.cs
@@ -141,7 +141,7 @@ namespace Avalonia.Logging
                 result.Append(')');
             }
 
-            return result.ToString();
+            return StringBuilderCache.GetStringAndRelease(result);
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/Brush.cs b/src/Avalonia.Base/Media/Brush.cs
index b9a560ad8f..accabce145 100644
--- a/src/Avalonia.Base/Media/Brush.cs
+++ b/src/Avalonia.Base/Media/Brush.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Media
     /// Describes how an area is painted.
     /// </summary>
     [TypeConverter(typeof(BrushConverter))]
-    public abstract class Brush : Animatable
+    public abstract class Brush : Animatable, IBrush
     {
         /// <summary>
         /// Defines the <see cref="Opacity"/> property.
diff --git a/src/Avalonia.Base/Media/DrawingContext.cs b/src/Avalonia.Base/Media/DrawingContext.cs
index 077816c645..d295111d72 100644
--- a/src/Avalonia.Base/Media/DrawingContext.cs
+++ b/src/Avalonia.Base/Media/DrawingContext.cs
@@ -246,7 +246,7 @@ namespace Avalonia.Media
 
             if (foreground != null)
             {
-                PlatformImpl.DrawGlyphRun(foreground, glyphRun);
+                PlatformImpl.DrawGlyphRun(foreground, glyphRun.PlatformImpl);
             }
         }
 
diff --git a/src/Avalonia.Base/Media/DrawingGroup.cs b/src/Avalonia.Base/Media/DrawingGroup.cs
index 7d3b4c056e..481329c20c 100644
--- a/src/Avalonia.Base/Media/DrawingGroup.cs
+++ b/src/Avalonia.Base/Media/DrawingGroup.cs
@@ -167,18 +167,17 @@ namespace Avalonia.Media
                 AddNewGeometryDrawing(brush, pen, new PlatformGeometry(geometry));
             }
 
-            public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+            public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
             {
                 if (foreground == null || glyphRun == null)
                 {
                     return;
                 }
 
-                // Add a GlyphRunDrawing to the Drawing graph
                 GlyphRunDrawing glyphRunDrawing = new GlyphRunDrawing
                 {
                     Foreground = foreground,
-                    GlyphRun = glyphRun,
+                    GlyphRun = new GlyphRun(glyphRun)
                 };
 
                 // Add Drawing to the Drawing graph
diff --git a/src/Avalonia.Base/Media/FontManager.cs b/src/Avalonia.Base/Media/FontManager.cs
index e82d5b7ba5..2dabb29e76 100644
--- a/src/Avalonia.Base/Media/FontManager.cs
+++ b/src/Avalonia.Base/Media/FontManager.cs
@@ -132,7 +132,7 @@ namespace Avalonia.Media
                 {
                     typeface = new Typeface(fallback.FontFamily, fontStyle, fontWeight, fontStretch);
 
-                    var glyphTypeface = typeface.GlyphTypeface;
+                    var glyphTypeface = GetOrAddGlyphTypeface(typeface);
 
                     if(glyphTypeface.TryGetGlyph((uint)codepoint, out _)){
                         return true;
diff --git a/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs b/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
index eb42f6443b..f2350f5aea 100644
--- a/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
+++ b/src/Avalonia.Base/Media/Fonts/FamilyNameCollection.cs
@@ -1,13 +1,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using Avalonia.Utilities;
 
 namespace Avalonia.Media.Fonts
 {
     public sealed class FamilyNameCollection : IReadOnlyList<string>
     {
+        private readonly string[] _names;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="FamilyNameCollection"/> class.
         /// </summary>
@@ -20,13 +21,20 @@ namespace Avalonia.Media.Fonts
                 throw new ArgumentNullException(nameof(familyNames));
             }
 
-            Names = Array.ConvertAll(familyNames.Split(','), p => p.Trim());
+            _names = SplitNames(familyNames);
 
-            PrimaryFamilyName = Names[0];
+            PrimaryFamilyName = _names[0];
 
-            HasFallbacks = Names.Count > 1;
+            HasFallbacks = _names.Length > 1;
         }
 
+        private static string[] SplitNames(string names)
+#if NET6_0_OR_GREATER
+            => names.Split(',', StringSplitOptions.TrimEntries);
+#else
+            => Array.ConvertAll(names.Split(','), p => p.Trim());
+#endif
+
         /// <summary>
         /// Gets the primary family name.
         /// </summary>
@@ -43,14 +51,6 @@ namespace Avalonia.Media.Fonts
         /// </value>
         public bool HasFallbacks { get; }
 
-        /// <summary>
-        /// Gets the internal collection of names.
-        /// </summary>
-        /// <value>
-        /// The names.
-        /// </value>
-        internal IReadOnlyList<string> Names { get; }
-
         /// <summary>
         /// Returns an enumerator for the name collection.
         /// </summary>
@@ -76,23 +76,7 @@ namespace Avalonia.Media.Fonts
         /// A <see cref="string" /> that represents this instance.
         /// </returns>
         public override string ToString()
-        {
-            var builder = StringBuilderCache.Acquire();
-
-            for (var index = 0; index < Names.Count; index++)
-            {
-                builder.Append(Names[index]);
-
-                if (index == Names.Count - 1)
-                {
-                    break;
-                }
-
-                builder.Append(", ");
-            }
-
-            return StringBuilderCache.GetStringAndRelease(builder);
-        }
+            => String.Join(", ", _names);
 
         /// <summary>
         /// Returns a hash code for this instance.
@@ -102,7 +86,7 @@ namespace Avalonia.Media.Fonts
         /// </returns>
         public override int GetHashCode()
         {
-            if (Count == 0)
+            if (_names.Length == 0)
             {
                 return 0;
             }
@@ -111,9 +95,9 @@ namespace Avalonia.Media.Fonts
             {
                 int hash = 17;
 
-                for (var i = 0; i < Names.Count; i++)
+                for (var i = 0; i < _names.Length; i++)
                 {
-                    string name = Names[i];
+                    string name = _names[i];
 
                     hash = hash * 23 + name.GetHashCode();
                 }
@@ -145,30 +129,10 @@ namespace Avalonia.Media.Fonts
         ///   <c>true</c> if the specified <see cref="object" /> is equal to this instance; otherwise, <c>false</c>.
         /// </returns>
         public override bool Equals(object? obj)
-        {
-            if (!(obj is FamilyNameCollection other))
-            {
-                return false;
-            }
-
-            if (other.Count != Count)
-            {
-                return false;
-            }
-
-            for (int i = 0; i < Count; i++)
-            {
-                if (Names[i] != other.Names[i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
+            => obj is FamilyNameCollection other && _names.AsSpan().SequenceEqual(other._names);
 
-        public int Count => Names.Count;
+        public int Count => _names.Length;
 
-        public string this[int index] => Names[index];
+        public string this[int index] => _names[index];
     }
 }
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index fc4bc6aa1c..0ec7152359 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -11,64 +13,133 @@ namespace Avalonia.Media
     /// </summary>
     public sealed class GlyphRun : IDisposable
     {
-        private static readonly IComparer<int> s_ascendingComparer = Comparer<int>.Default;
-        private static readonly IComparer<int> s_descendingComparer = new ReverseComparer<int>();
+        private readonly static IPlatformRenderInterface s_renderInterface;
 
-        private IGlyphRunImpl? _glyphRunImpl;
-        private IGlyphTypeface _glyphTypeface;
+        private IRef<IGlyphRunImpl>? _platformImpl;
         private double _fontRenderingEmSize;
         private int _biDiLevel;
-        private Point? _baselineOrigin;
         private GlyphRunMetrics? _glyphRunMetrics;
-
         private ReadOnlyMemory<char> _characters;
-        private IReadOnlyList<ushort> _glyphIndices;
-        private IReadOnlyList<double>? _glyphAdvances;
-        private IReadOnlyList<Vector>? _glyphOffsets;
-        private IReadOnlyList<int>? _glyphClusters;
+        private IReadOnlyList<GlyphInfo> _glyphInfos;
+        private Point? _baselineOrigin;
+        private bool _hasOneCharPerCluster; // if true, character index and cluster are similar
+
+        static GlyphRun()
+        {
+            s_renderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
+        }
 
         /// <summary>
-        ///     Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
+        /// Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
         /// </summary>
         /// <param name="glyphTypeface">The glyph typeface.</param>
         /// <param name="fontRenderingEmSize">The rendering em size.</param>
-        /// <param name="glyphIndices">The glyph indices.</param>
-        /// <param name="glyphAdvances">The glyph advances.</param>
-        /// <param name="glyphOffsets">The glyph offsets.</param>
         /// <param name="characters">The characters.</param>
-        /// <param name="glyphClusters">The glyph clusters.</param>
+        /// <param name="glyphIndices">The glyph indices.</param>
+        /// <param name="baselineOrigin">The baseline origin of the run.</param>
         /// <param name="biDiLevel">The bidi level.</param>
         public GlyphRun(
             IGlyphTypeface glyphTypeface,
             double fontRenderingEmSize,
             ReadOnlyMemory<char> characters,
             IReadOnlyList<ushort> glyphIndices,
-            IReadOnlyList<double>? glyphAdvances = null,
-            IReadOnlyList<Vector>? glyphOffsets = null,
-            IReadOnlyList<int>? glyphClusters = null,
+            Point? baselineOrigin = null,
+            int biDiLevel = 0)
+            : this(glyphTypeface, fontRenderingEmSize, characters,
+                CreateGlyphInfos(glyphIndices, fontRenderingEmSize, glyphTypeface), baselineOrigin, biDiLevel)
+        {
+            _hasOneCharPerCluster = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GlyphRun"/> class by specifying properties of the class.
+        /// </summary>
+        /// <param name="glyphTypeface">The glyph typeface.</param>
+        /// <param name="fontRenderingEmSize">The rendering em size.</param>
+        /// <param name="characters">The characters.</param>
+        /// <param name="glyphInfos">The list of glyphs used.</param>
+        /// <param name="baselineOrigin">The baseline origin of the run.</param>
+        /// <param name="biDiLevel">The bidi level.</param>
+        public GlyphRun(
+            IGlyphTypeface glyphTypeface,
+            double fontRenderingEmSize,
+            ReadOnlyMemory<char> characters,
+            IReadOnlyList<GlyphInfo> glyphInfos,
+            Point? baselineOrigin = null,
             int biDiLevel = 0)
         {
-            _glyphTypeface = glyphTypeface;
+            GlyphTypeface = glyphTypeface;
 
             _fontRenderingEmSize = fontRenderingEmSize;
 
             _characters = characters;
 
-            _glyphIndices = glyphIndices;
+            _glyphInfos = glyphInfos;
 
-            _glyphAdvances = glyphAdvances;
+            _baselineOrigin = baselineOrigin;
 
-            _glyphOffsets = glyphOffsets;
+            _biDiLevel = biDiLevel;
+        }
 
-            _glyphClusters = glyphClusters;
+        internal GlyphRun(IRef<IGlyphRunImpl> platformImpl)
+        {
+            _glyphInfos = Array.Empty<GlyphInfo>();
+            GlyphTypeface = Typeface.Default.GlyphTypeface;
+            _platformImpl = platformImpl;
+            _baselineOrigin = platformImpl.Item.BaselineOrigin;
+        }
 
-            _biDiLevel = biDiLevel;
+        private static IReadOnlyList<GlyphInfo> CreateGlyphInfos(IReadOnlyList<ushort> glyphIndices,
+            double fontRenderingEmSize, IGlyphTypeface glyphTypeface)
+        {
+            var glyphIndexSpan = ListToSpan(glyphIndices);
+            var glyphAdvances = glyphTypeface.GetGlyphAdvances(glyphIndexSpan);
+
+            var glyphInfos = new GlyphInfo[glyphIndexSpan.Length];
+            var scale = fontRenderingEmSize / glyphTypeface.Metrics.DesignEmHeight;
+
+            for (var i = 0; i < glyphIndexSpan.Length; ++i)
+            {
+                glyphInfos[i] = new GlyphInfo(glyphIndexSpan[i], i, glyphAdvances[i] * scale);
+            }
+
+            return glyphInfos;
+        }
+
+        private static ReadOnlySpan<ushort> ListToSpan(IReadOnlyList<ushort> list)
+        {
+            var count = list.Count;
+
+            if (count == 0)
+            {
+                return default;
+            }
+
+            if (list is ushort[] array)
+            {
+                return array.AsSpan();
+            }
+
+#if NET6_0_OR_GREATER
+            if (list is List<ushort> concreteList)
+            {
+                return CollectionsMarshal.AsSpan(concreteList);
+            }
+#endif
+
+            array = new ushort[count];
+            for (var i = 0; i < count; ++i)
+            {
+                array[i] = list[i];
+            }
+
+            return array.AsSpan();
         }
 
         /// <summary>
         ///     Gets the <see cref="IGlyphTypeface"/> for the <see cref="GlyphRun"/>.
         /// </summary>
-        public IGlyphTypeface GlyphTypeface => _glyphTypeface;
+        public IGlyphTypeface GlyphTypeface { get; }
 
         /// <summary>
         ///     Gets or sets the em size used for rendering the <see cref="GlyphRun"/>.
@@ -82,62 +153,23 @@ namespace Avalonia.Media
         /// <summary>
         ///     Gets or sets the conservative bounding box of the <see cref="GlyphRun"/>.
         /// </summary>
-        public Size Size => new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height);
+        public Size Size => PlatformImpl.Item.Size;
 
         /// <summary>
         /// 
         /// </summary>
         public GlyphRunMetrics Metrics
-        {
-            get
-            {
-                _glyphRunMetrics ??= CreateGlyphRunMetrics();
-
-                return _glyphRunMetrics.Value;
-            }
-        }
+            => _glyphRunMetrics ??= CreateGlyphRunMetrics();
 
         /// <summary>
         ///     Gets or sets the baseline origin of the<see cref="GlyphRun"/>.
         /// </summary>
         public Point BaselineOrigin
         {
-            get
-            {
-                _baselineOrigin ??= CalculateBaselineOrigin();
-
-                return _baselineOrigin.Value;
-            }
+            get => _baselineOrigin ?? default;
             set => Set(ref _baselineOrigin, value);
         }
 
-        /// <summary>
-        ///     Gets or sets an array of <see cref="ushort"/> values that represent the glyph indices in the rendering physical font.
-        /// </summary>
-        public IReadOnlyList<ushort> GlyphIndices
-        {
-            get => _glyphIndices;
-            set => Set(ref _glyphIndices, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="double"/> values that represent the advances corresponding to the glyph indices.
-        /// </summary>
-        public IReadOnlyList<double>? GlyphAdvances
-        {
-            get => _glyphAdvances;
-            set => Set(ref _glyphAdvances, value);
-        }
-
-        /// <summary>
-        ///     Gets or sets an array of <see cref="Vector"/> values representing the offsets of the glyphs in the <see cref="GlyphRun"/>.
-        /// </summary>
-        public IReadOnlyList<Vector>? GlyphOffsets
-        {
-            get => _glyphOffsets;
-            set => Set(ref _glyphOffsets, value);
-        }
-
         /// <summary>
         ///     Gets or sets the list of UTF16 code points that represent the Unicode content of the <see cref="GlyphRun"/>.
         /// </summary>
@@ -148,12 +180,16 @@ namespace Avalonia.Media
         }
 
         /// <summary>
-        ///     Gets or sets a list of <see cref="int"/> values representing a mapping from character index to glyph index.
+        /// Gets or sets the list of glyphs to use to render this run.
         /// </summary>
-        public IReadOnlyList<int>? GlyphClusters
+        public IReadOnlyList<GlyphInfo> GlyphInfos
         {
-            get => _glyphClusters;
-            set => Set(ref _glyphClusters, value);
+            get => _glyphInfos;
+            set
+            {
+                Set(ref _glyphInfos, value);
+                _hasOneCharPerCluster = false;
+            }
         }
 
         /// <summary>
@@ -178,18 +214,8 @@ namespace Avalonia.Media
         /// <summary>
         /// The platform implementation of the <see cref="GlyphRun"/>.
         /// </summary>
-        public IGlyphRunImpl GlyphRunImpl
-        {
-            get
-            {
-                if (_glyphRunImpl == null)
-                {
-                    Initialize();
-                }
-
-                return _glyphRunImpl!;
-            }
-        }
+        public IRef<IGlyphRunImpl> PlatformImpl
+            => _platformImpl ??= CreateGlyphRunImpl();
 
         /// <summary>
         /// Obtains geometry for the glyph run.
@@ -197,9 +223,7 @@ namespace Avalonia.Media
         /// <returns>The geometry returned contains the combined geometry of all glyphs in the glyph run.</returns>
         public Geometry BuildGeometry()
         {
-            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-
-            var geometryImpl = platformRenderInterface.BuildGlyphRunGeometry(this);
+            var geometryImpl = s_renderInterface.BuildGlyphRunGeometry(this);
 
             return new PlatformGeometry(geometryImpl);
         }
@@ -221,38 +245,32 @@ namespace Avalonia.Media
 
             if (IsLeftToRight)
             {
-                if (GlyphClusters != null)
+                if (characterIndex < Metrics.FirstCluster)
                 {
-                    if (characterIndex < Metrics.FirstCluster)
-                    {
-                        return 0;
-                    }
+                    return 0;
+                }
 
-                    if (characterIndex > Metrics.LastCluster)
-                    {
-                        return Metrics.WidthIncludingTrailingWhitespace;
-                    }
+                if (characterIndex > Metrics.LastCluster)
+                {
+                    return Size.Width;
                 }
 
                 var glyphIndex = FindGlyphIndex(characterIndex);
 
-                if (GlyphClusters != null)
-                {
-                    var currentCluster = GlyphClusters[glyphIndex];
+                var currentCluster = _glyphInfos[glyphIndex].GlyphCluster;
 
-                    //Move to the end of the glyph cluster
-                    if (characterHit.TrailingLength > 0)
+                //Move to the end of the glyph cluster
+                if (characterHit.TrailingLength > 0)
+                {
+                    while (glyphIndex + 1 < _glyphInfos.Count && _glyphInfos[glyphIndex + 1].GlyphCluster == currentCluster)
                     {
-                        while (glyphIndex + 1 < GlyphClusters.Count && GlyphClusters[glyphIndex + 1] == currentCluster)
-                        {
-                            glyphIndex++;
-                        }
+                        glyphIndex++;
                     }
                 }
 
                 for (var i = 0; i < glyphIndex; i++)
                 {
-                    distance += GetGlyphAdvance(i, out _);
+                    distance += _glyphInfos[i].GlyphAdvance;
                 }
 
                 return distance;
@@ -262,22 +280,19 @@ namespace Avalonia.Media
                 //RightToLeft
                 var glyphIndex = FindGlyphIndex(characterIndex);
 
-                if (GlyphClusters != null && GlyphClusters.Count > 0)
+                if (characterIndex > Metrics.LastCluster)
                 {
-                    if (characterIndex > Metrics.LastCluster)
-                    {
-                        return 0;
-                    }
+                    return 0;
+                }
 
-                    if (characterIndex <= Metrics.FirstCluster)
-                    {
-                        return Size.Width;
-                    }
+                if (characterIndex <= Metrics.FirstCluster)
+                {
+                    return Size.Width;
                 }
 
-                for (var i = glyphIndex + 1; i < GlyphIndices.Count; i++)
+                for (var i = glyphIndex + 1; i < _glyphInfos.Count; i++)
                 {
-                    distance += GetGlyphAdvance(i, out _);
+                    distance += _glyphInfos[i].GlyphAdvance;
                 }
 
                 return Size.Width - distance;
@@ -322,11 +337,12 @@ namespace Avalonia.Media
 
             if (IsLeftToRight)
             {
-                for (var index = 0; index < GlyphIndices.Count; index++)
+                for (var index = 0; index < _glyphInfos.Count; index++)
                 {
-                    var advance = GetGlyphAdvance(index, out var cluster);
+                    var glyphInfo = _glyphInfos[index];
+                    var advance = glyphInfo.GlyphAdvance;
 
-                    characterIndex = cluster;
+                    characterIndex = glyphInfo.GlyphCluster;
 
                     if (distance > currentX && distance <= currentX + advance)
                     {
@@ -340,11 +356,12 @@ namespace Avalonia.Media
             {
                 currentX = Size.Width;
 
-                for (var index = GlyphIndices.Count - 1; index >= 0; index--)
+                for (var index = _glyphInfos.Count - 1; index >= 0; index--)
                 {
-                    var advance = GetGlyphAdvance(index, out var cluster);
+                    var glyphInfo = _glyphInfos[index];
+                    var advance = glyphInfo.GlyphAdvance;
 
-                    characterIndex = cluster;
+                    characterIndex = glyphInfo.GlyphCluster;
 
                     var offsetX = currentX - advance;
 
@@ -424,7 +441,7 @@ namespace Avalonia.Media
         /// </returns>
         public int FindGlyphIndex(int characterIndex)
         {
-            if (GlyphClusters == null || GlyphClusters.Count == 0)
+            if (_hasOneCharPerCluster)
             {
                 return characterIndex;
             }
@@ -433,7 +450,7 @@ namespace Avalonia.Media
             {
                 if (IsLeftToRight)
                 {
-                    return GlyphIndices.Count - 1;
+                    return _glyphInfos.Count - 1;
                 }
 
                 return 0;
@@ -446,15 +463,13 @@ namespace Avalonia.Media
                     return 0;
                 }
 
-                return GlyphIndices.Count - 1;
+                return _glyphInfos.Count - 1;
             }
 
-            var comparer = IsLeftToRight ? s_ascendingComparer : s_descendingComparer;
-
-            var clusters = GlyphClusters;
+            var comparer = IsLeftToRight ? GlyphInfo.ClusterAscendingComparer : GlyphInfo.ClusterDescendingComparer;
 
             // Find the start of the cluster at the character index.
-            var start = clusters.BinarySearch(characterIndex, comparer);
+            var start = _glyphInfos.BinarySearch(new GlyphInfo(default, characterIndex, default), comparer);
 
             // No cluster found.
             if (start < 0)
@@ -463,40 +478,38 @@ namespace Avalonia.Media
                 {
                     characterIndex--;
 
-                    start = clusters.BinarySearch(characterIndex, comparer);
+                    start = _glyphInfos.BinarySearch(new GlyphInfo(default, characterIndex, default), comparer);
                 }
 
                 if (start < 0)
                 {
-                    goto result;
+                    return 0;
                 }
             }
 
             if (IsLeftToRight)
             {
-                while (start > 0 && clusters[start - 1] == clusters[start])
+                while (start > 0 && _glyphInfos[start - 1].GlyphCluster == _glyphInfos[start].GlyphCluster)
                 {
                     start--;
                 }
             }
             else
             {
-                while (start + 1 < clusters.Count && clusters[start + 1] == clusters[start])
+                while (start + 1 < _glyphInfos.Count && _glyphInfos[start + 1].GlyphCluster == _glyphInfos[start].GlyphCluster)
                 {
                     start++;
                 }
             }
 
-        result:
-
             if (start < 0)
             {
                 return 0;
             }
 
-            if (start > GlyphIndices.Count - 1)
+            if (start > _glyphInfos.Count - 1)
             {
-                return GlyphIndices.Count - 1;
+                return _glyphInfos.Count - 1;
             }
 
             return start;
@@ -516,14 +529,14 @@ namespace Avalonia.Media
 
             var glyphIndex = FindGlyphIndex(index);
 
-            if (GlyphClusters == null)
+            if (_hasOneCharPerCluster)
             {
-                width = GetGlyphAdvance(index, out _);
+                width = _glyphInfos[index].GlyphAdvance;
 
                 return new CharacterHit(glyphIndex, 1);
             }
 
-            var cluster = GlyphClusters[glyphIndex];
+            var cluster = _glyphInfos[glyphIndex].GlyphCluster;
 
             var nextCluster = cluster;
 
@@ -531,13 +544,13 @@ namespace Avalonia.Media
 
             while (nextCluster == cluster)
             {
-                width += GetGlyphAdvance(currentIndex, out _);
+                width += _glyphInfos[currentIndex].GlyphAdvance;
 
                 if (IsLeftToRight)
                 {
                     currentIndex++;
 
-                    if (currentIndex == GlyphClusters.Count)
+                    if (currentIndex == _glyphInfos.Count)
                     {
                         break;
                     }
@@ -552,7 +565,7 @@ namespace Avalonia.Media
                     }
                 }
 
-                nextCluster = GlyphClusters[currentIndex];
+                nextCluster = _glyphInfos[currentIndex].GlyphCluster;
             }
 
             var clusterLength = Math.Max(0, nextCluster - cluster);
@@ -565,9 +578,9 @@ namespace Avalonia.Media
 
                 if (IsLeftToRight)
                 {
-                    for (int i = 1; i < GlyphClusters.Count; i++)
+                    for (int i = 1; i < _glyphInfos.Count; i++)
                     {
-                        nextCluster = GlyphClusters[i];
+                        nextCluster = _glyphInfos[i].GlyphCluster;
 
                         if (currentCluster > cluster)
                         {
@@ -583,9 +596,9 @@ namespace Avalonia.Media
                 }
                 else
                 {
-                    for (int i = GlyphClusters.Count - 1; i >= 0; i--)
+                    for (int i = _glyphInfos.Count - 1; i >= 0; i--)
                     {
-                        nextCluster = GlyphClusters[i];
+                        nextCluster = _glyphInfos[i].GlyphCluster;
 
                         if (currentCluster > cluster)
                         {
@@ -613,51 +626,19 @@ namespace Avalonia.Media
             return new CharacterHit(cluster, clusterLength);
         }
 
-        /// <summary>
-        /// Gets a glyph's width.
-        /// </summary>
-        /// <param name="index">The glyph index.</param>
-        /// <param name="cluster">The current cluster.</param>
-        /// <returns>The glyph's width.</returns>
-        private double GetGlyphAdvance(int index, out int cluster)
-        {
-            cluster = GlyphClusters != null ? GlyphClusters[index] : index;
-
-            if (GlyphAdvances != null)
-            {
-                return GlyphAdvances[index];
-            }
-
-            var glyph = GlyphIndices[index];
-
-            return GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
-        }
-
-        /// <summary>
-        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <returns>The baseline origin.</returns>
-        private Point CalculateBaselineOrigin()
-        {
-            return new Point(0, -GlyphTypeface.Metrics.Ascent * Scale);
-        }
-
         private GlyphRunMetrics CreateGlyphRunMetrics()
         {
-            int firstCluster = 0, lastCluster = 0;
+            int firstCluster, lastCluster;
 
-            if (_glyphClusters != null && _glyphClusters.Count > 0)
+            if (Characters.IsEmpty)
             {
-                firstCluster = _glyphClusters[0];
-                lastCluster = _glyphClusters[_glyphClusters.Count - 1];
+                firstCluster = 0;
+                lastCluster = 0;
             }
             else
             {
-                if (!Characters.IsEmpty)
-                {
-                    firstCluster = 0;
-                    lastCluster = Characters.Length - 1;
-                }
+                firstCluster = _glyphInfos[0].GlyphCluster;
+                lastCluster = _glyphInfos[_glyphInfos.Count - 1].GlyphCluster;
             }
 
             if (!IsLeftToRight)
@@ -671,9 +652,9 @@ namespace Avalonia.Media
 
             var trailingWhitespaceLength = GetTrailingWhitespaceLength(isReversed, out var newLineLength, out var glyphCount);
 
-            for (var index = 0; index < GlyphIndices.Count; index++)
+            for (var index = 0; index < _glyphInfos.Count; index++)
             {
-                var advance = GetGlyphAdvance(index, out _);
+                var advance = _glyphInfos[index].GlyphAdvance;
 
                 widthIncludingTrailingWhitespace += advance;
             }
@@ -684,21 +665,19 @@ namespace Avalonia.Media
             {
                 for (var index = 0; index < glyphCount; index++)
                 {
-                    width -= GetGlyphAdvance(index, out _);
+                    width -= _glyphInfos[index].GlyphAdvance;
                 }
             }
             else
             {
-                for (var index = GlyphIndices.Count - glyphCount; index < GlyphIndices.Count; index++)
+                for (var index = _glyphInfos.Count - glyphCount; index < _glyphInfos.Count; index++)
                 {
-                    width -= GetGlyphAdvance(index, out _);
+                    width -= _glyphInfos[index].GlyphAdvance;
                 }
             }
 
             return new GlyphRunMetrics(
                 width,
-                widthIncludingTrailingWhitespace,
-                height,
                 trailingWhitespaceLength,
                 newLineLength,
                 firstCluster,
@@ -710,7 +689,7 @@ namespace Avalonia.Media
         {
             if (isReversed)
             {
-                return GetTralingWhitespaceLengthRightToLeft(out newLineLength, out glyphCount);
+                return GetTrailingWhitespaceLengthRightToLeft(out newLineLength, out glyphCount);
             }
 
             glyphCount = 0;
@@ -720,84 +699,59 @@ namespace Avalonia.Media
 
             if (!charactersSpan.IsEmpty)
             {
-                if (GlyphClusters == null)
-                {
-                    for (var i = charactersSpan.Length - 1; i >= 0;)
-                    {
-                        var codepoint = Codepoint.ReadAt(charactersSpan, i, out var count);
-
-                        if (!codepoint.IsWhiteSpace)
-                        {
-                            break;
-                        }
+                var characterIndex = charactersSpan.Length - 1;
 
-                        if (codepoint.IsBreakChar)
-                        {
-                            newLineLength++;
-                        }
-
-                        trailingWhitespaceLength++;
-
-                        i -= count;
-                        glyphCount++;
-                    }
-                }
-                else
+                for (var i = _glyphInfos.Count - 1; i >= 0; i--)
                 {
-                    var characterIndex = charactersSpan.Length - 1;
+                    var currentCluster = _glyphInfos[i].GlyphCluster;
+                    var codepoint = Codepoint.ReadAt(charactersSpan, characterIndex, out var characterLength);
 
-                    for (var i = GlyphClusters.Count - 1; i >= 0; i--)
-                    {
-                        var currentCluster = GlyphClusters[i];
-                        var codepoint = Codepoint.ReadAt(charactersSpan, characterIndex, out var characterLength);
+                    characterIndex -= characterLength;
 
-                        characterIndex -= characterLength;
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
 
-                        if (!codepoint.IsWhiteSpace)
-                        {
-                            break;
-                        }
+                    var clusterLength = 1;
 
-                        var clusterLength = 1;
+                    while (i - 1 >= 0)
+                    {
+                        var nextCluster = _glyphInfos[i - 1].GlyphCluster;
 
-                        while (i - 1 >= 0)
+                        if (currentCluster == nextCluster)
                         {
-                            var nextCluster = GlyphClusters[i - 1];
+                            clusterLength++;
+                            i--;
 
-                            if (currentCluster == nextCluster)
+                            if(characterIndex >= 0)
                             {
-                                clusterLength++;
-                                i--;
-
-                                if(characterIndex >= 0)
-                                {
-                                    codepoint = Codepoint.ReadAt(charactersSpan, characterIndex, out characterLength);
-
-                                    characterIndex -= characterLength;
-                                }
+                                codepoint = Codepoint.ReadAt(charactersSpan, characterIndex, out characterLength);
 
-                                continue;
+                                characterIndex -= characterLength;
                             }
 
-                            break;
-                        }
-
-                        if (codepoint.IsBreakChar)
-                        {
-                            newLineLength += clusterLength;
+                            continue;
                         }
 
-                        trailingWhitespaceLength += clusterLength;
+                        break;
+                    }
 
-                        glyphCount++;
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength += clusterLength;
                     }
+
+                    trailingWhitespaceLength += clusterLength;
+
+                    glyphCount++;
                 }
             }
 
             return trailingWhitespaceLength;
         }
 
-        private int GetTralingWhitespaceLengthRightToLeft(out int newLineLength, out int glyphCount)
+        private int GetTrailingWhitespaceLengthRightToLeft(out int newLineLength, out int glyphCount)
         {
             glyphCount = 0;
             newLineLength = 0;
@@ -806,71 +760,46 @@ namespace Avalonia.Media
 
             if (!charactersSpan.IsEmpty)
             {
-                if (GlyphClusters == null)
-                {
-                    for (var i = 0; i < charactersSpan.Length;)
-                    {
-                        var codepoint = Codepoint.ReadAt(charactersSpan, i, out var count);
+                var characterIndex = 0;
 
-                        if (!codepoint.IsWhiteSpace)
-                        {
-                            break;
-                        }
-
-                        if (codepoint.IsBreakChar)
-                        {
-                            newLineLength++;
-                        }
-
-                        trailingWhitespaceLength++;
-
-                        i += count;
-                        glyphCount++;
-                    }
-                }
-                else
+                for (var i = 0; i < _glyphInfos.Count; i++)
                 {
-                    var characterIndex = 0;
+                    var currentCluster = _glyphInfos[i].GlyphCluster;
+                    var codepoint = Codepoint.ReadAt(charactersSpan, characterIndex, out var characterLength);
 
-                    for (var i = 0; i < GlyphClusters.Count; i++)
-                    {
-                        var currentCluster = GlyphClusters[i];
-                        var codepoint = Codepoint.ReadAt(charactersSpan, characterIndex, out var characterLength);
+                    characterIndex += characterLength;
 
-                        characterIndex += characterLength;
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
 
-                        if (!codepoint.IsWhiteSpace)
-                        {
-                            break;
-                        }
+                    var clusterLength = 1;
 
-                        var clusterLength = 1;
+                    var j = i;
 
-                        var j = i;
+                    while (j - 1 >= 0)
+                    {
+                        var nextCluster = _glyphInfos[--j].GlyphCluster;
 
-                        while (j - 1 >= 0)
+                        if (currentCluster == nextCluster)
                         {
-                            var nextCluster = GlyphClusters[--j];
-
-                            if (currentCluster == nextCluster)
-                            {
-                                clusterLength++;
+                            clusterLength++;
 
-                                continue;
-                            }
-
-                            break;
+                            continue;
                         }
 
-                        if (codepoint.IsBreakChar)
-                        {
-                            newLineLength += clusterLength;
-                        }
-
-                        trailingWhitespaceLength += clusterLength;
+                        break;
+                    }
 
-                        glyphCount += clusterLength;
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength += clusterLength;
                     }
+
+                    trailingWhitespaceLength += clusterLength;
+
+                    glyphCount += clusterLength;
                 }
             }
 
@@ -879,55 +808,32 @@ namespace Avalonia.Media
 
         private void Set<T>(ref T field, T value)
         {
-            _glyphRunImpl?.Dispose();
+            _platformImpl?.Dispose();
 
-            _glyphRunImpl = null;
+            _platformImpl = null;
 
             _glyphRunMetrics = null;
 
-            _baselineOrigin = null;
-
             field = value;
         }
 
-        /// <summary>
-        /// Initializes the <see cref="GlyphRun"/>.
-        /// </summary>
-        private void Initialize()
+        private IRef<IGlyphRunImpl> CreateGlyphRunImpl()
         {
-            if (GlyphIndices == null)
-            {
-                throw new InvalidOperationException();
-            }
+            var platformImpl = s_renderInterface.CreateGlyphRun(
+                GlyphTypeface, 
+                FontRenderingEmSize, 
+                GlyphInfos, 
+                _baselineOrigin ?? new Point(0, -GlyphTypeface.Metrics.Ascent * Scale));
 
-            var glyphCount = GlyphIndices.Count;
+            _platformImpl = RefCountable.Create(platformImpl);
 
-            if (GlyphAdvances != null && GlyphAdvances.Count > 0 && GlyphAdvances.Count != glyphCount)
-            {
-                throw new InvalidOperationException();
-            }
-
-            if (GlyphOffsets != null && GlyphOffsets.Count > 0 && GlyphOffsets.Count != glyphCount)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-
-            _glyphRunImpl = platformRenderInterface.CreateGlyphRun(GlyphTypeface, FontRenderingEmSize, GlyphIndices, GlyphAdvances, GlyphOffsets);
+            return _platformImpl;
         }
 
         public void Dispose()
         {
-            _glyphRunImpl?.Dispose();
-        }
-
-        private class ReverseComparer<T> : IComparer<T>
-        {
-            public int Compare(T? x, T? y)
-            {
-                return Comparer<T>.Default.Compare(y, x);
-            }
+            _platformImpl?.Dispose();
+            _platformImpl = null;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/GlyphRunMetrics.cs b/src/Avalonia.Base/Media/GlyphRunMetrics.cs
index 492b5214cd..09b183d044 100644
--- a/src/Avalonia.Base/Media/GlyphRunMetrics.cs
+++ b/src/Avalonia.Base/Media/GlyphRunMetrics.cs
@@ -2,27 +2,20 @@
 {
     public readonly record struct GlyphRunMetrics
     {
-        public GlyphRunMetrics(double width, double widthIncludingTrailingWhitespace, double height,
-            int trailingWhitespaceLength, int newLineLength, int firstCluster, int lastCluster)
+        public GlyphRunMetrics(double width, int trailingWhitespaceLength, int newLineLength, int firstCluster, int lastCluster)
         {
             Width = width;
-            WidthIncludingTrailingWhitespace = widthIncludingTrailingWhitespace;
-            Height = height;
             TrailingWhitespaceLength = trailingWhitespaceLength;
-            NewLineLength= newLineLength;
+            NewLineLength = newLineLength;
             FirstCluster = firstCluster;
             LastCluster = lastCluster;
         }
 
         public double Width { get; }
 
-        public double WidthIncludingTrailingWhitespace { get; }
-
-        public double Height { get; }
-
         public int TrailingWhitespaceLength { get; }
-        
-        public int NewLineLength { get;  }
+
+        public int NewLineLength { get; }
 
         public int FirstCluster { get; }
 
diff --git a/src/Avalonia.Base/Media/ImmediateDrawingContext.cs b/src/Avalonia.Base/Media/ImmediateDrawingContext.cs
index eb6f105680..7d9534c414 100644
--- a/src/Avalonia.Base/Media/ImmediateDrawingContext.cs
+++ b/src/Avalonia.Base/Media/ImmediateDrawingContext.cs
@@ -182,7 +182,7 @@ namespace Avalonia.Media
         /// </summary>
         /// <param name="foreground">The foreground brush.</param>
         /// <param name="glyphRun">The glyph run.</param>
-        public void DrawGlyphRun(IImmutableBrush foreground, GlyphRun glyphRun)
+        public void DrawGlyphRun(IImmutableBrush foreground, IRef<IGlyphRunImpl> glyphRun)
         {
             _ = glyphRun ?? throw new ArgumentNullException(nameof(glyphRun));
 
diff --git a/src/Avalonia.Base/Media/TextDecoration.cs b/src/Avalonia.Base/Media/TextDecoration.cs
index d6b2841214..dc9e5cb907 100644
--- a/src/Avalonia.Base/Media/TextDecoration.cs
+++ b/src/Avalonia.Base/Media/TextDecoration.cs
@@ -218,7 +218,7 @@ namespace Avalonia.Media
             {
                 var offsetY = glyphRun.BaselineOrigin.Y - origin.Y;
 
-                var intersections = glyphRun.GlyphRunImpl.GetIntersections((float)(thickness * 0.5d - offsetY), (float)(thickness * 1.5d - offsetY));
+                var intersections = glyphRun.PlatformImpl.Item.GetIntersections((float)(thickness * 0.5d - offsetY), (float)(thickness * 1.5d - offsetY));
 
                 if (intersections != null && intersections.Count > 0)
                 {
diff --git a/src/Avalonia.Base/Media/TextFormatting/BidiReorderer.cs b/src/Avalonia.Base/Media/TextFormatting/BidiReorderer.cs
new file mode 100644
index 0000000000..4db55fae6d
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/BidiReorderer.cs
@@ -0,0 +1,268 @@
+using System;
+using System.Diagnostics;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Reorders text runs according to their bidi level.
+    /// </summary>
+    /// <remarks>To avoid allocations, this class is designed to be reused.</remarks>
+    internal sealed class BidiReorderer
+    {
+        [ThreadStatic] private static BidiReorderer? t_instance;
+
+        private ArrayBuilder<OrderedBidiRun> _runs;
+        private ArrayBuilder<BidiRange> _ranges;
+
+        public static BidiReorderer Instance
+            => t_instance ??= new();
+
+        public void BidiReorder(Span<TextRun> textRuns, FlowDirection flowDirection)
+        {
+            Debug.Assert(_runs.Length == 0);
+            Debug.Assert(_ranges.Length == 0);
+
+            if (textRuns.IsEmpty)
+            {
+                return;
+            }
+
+            try
+            {
+                _runs.Add(textRuns.Length);
+
+                // Build up the collection of ordered runs.
+                for (var i = 0; i < textRuns.Length; i++)
+                {
+                    var textRun = textRuns[i];
+                    _runs[i] = new OrderedBidiRun(i, textRun, GetRunBidiLevel(textRun, flowDirection));
+
+                    if (i > 0)
+                    {
+                        _runs[i - 1].NextRunIndex = i;
+                    }
+                }
+
+                // Reorder them into visual order.
+                var firstIndex = LinearReorder();
+
+                // Now perform a recursive reversal of each run.
+                // From the highest level found in the text to the lowest odd level on each line, including intermediate levels
+                // not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
+                // https://unicode.org/reports/tr9/#L2
+                sbyte max = 0;
+                var min = sbyte.MaxValue;
+
+                for (var i = 0; i < textRuns.Length; i++)
+                {
+                    var level = GetRunBidiLevel(textRuns[i], flowDirection);
+                    if (level > max)
+                    {
+                        max = level;
+                    }
+
+                    if ((level & 1) != 0 && level < min)
+                    {
+                        min = level;
+                    }
+                }
+
+                if (min > max)
+                {
+                    min = max;
+                }
+
+                if (max == 0 || (min == max && (max & 1) == 0))
+                {
+                    // Nothing to reverse.
+                    return;
+                }
+
+                // Now apply the reversal and replace the original contents.
+                var minLevelToReverse = max;
+                int currentIndex;
+
+                while (minLevelToReverse >= min)
+                {
+                    currentIndex = firstIndex;
+
+                    while (currentIndex >= 0)
+                    {
+                        ref var current = ref _runs[currentIndex];
+                        if (current.Level >= minLevelToReverse && current.Level % 2 != 0)
+                        {
+                            if (current.Run is ShapedTextRun { IsReversed: false } shapedTextCharacters)
+                            {
+                                shapedTextCharacters.Reverse();
+                            }
+                        }
+
+                        currentIndex = current.NextRunIndex;
+                    }
+
+                    minLevelToReverse--;
+                }
+
+                var index = 0;
+
+                currentIndex = firstIndex;
+                while (currentIndex >= 0)
+                {
+                    ref var current = ref _runs[currentIndex];
+                    textRuns[index++] = current.Run;
+
+                    currentIndex = current.NextRunIndex;
+                }
+            }
+            finally
+            {
+                FormattingBufferHelper.ClearThenResetIfTooLarge(ref _runs);
+                FormattingBufferHelper.ClearThenResetIfTooLarge(ref _ranges);
+            }
+        }
+
+        private static sbyte GetRunBidiLevel(TextRun run, FlowDirection flowDirection)
+        {
+            if (run is ShapedTextRun shapedTextRun)
+            {
+                return shapedTextRun.BidiLevel;
+            }
+
+            var defaultLevel = flowDirection == FlowDirection.LeftToRight ? 0 : 1;
+            return (sbyte)defaultLevel;
+        }
+
+        /// <summary>
+        /// Reorders the runs from logical to visual order.
+        /// <see href="https://github.com/fribidi/linear-reorder/blob/f2f872257d4d8b8e137fcf831f254d6d4db79d3c/linear-reorder.c"/>
+        /// </summary>
+        /// <returns>The first run index in visual order.</returns>
+        private int LinearReorder()
+        {
+            var runIndex = 0;
+            var rangeIndex = -1;
+
+            while (runIndex >= 0)
+            {
+                ref var run = ref _runs[runIndex];
+                var nextRunIndex = run.NextRunIndex;
+
+                while (rangeIndex >= 0
+                    && _ranges[rangeIndex].Level > run.Level
+                    && _ranges[rangeIndex].PreviousRangeIndex >= 0
+                    && _ranges[_ranges[rangeIndex].PreviousRangeIndex].Level >= run.Level)
+                {
+
+                    rangeIndex = MergeRangeWithPrevious(rangeIndex);
+                }
+
+                if (rangeIndex >= 0 && _ranges[rangeIndex].Level >= run.Level)
+                {
+                    // Attach run to the range.
+                    if ((run.Level & 1) != 0)
+                    {
+                        // Odd, range goes to the right of run.
+                        run.NextRunIndex = _ranges[rangeIndex].LeftRunIndex;
+                        _ranges[rangeIndex].LeftRunIndex = runIndex;
+                    }
+                    else
+                    {
+                        // Even, range goes to the left of run.
+                        _runs[_ranges[rangeIndex].RightRunIndex].NextRunIndex = runIndex;
+                        _ranges[rangeIndex].RightRunIndex = runIndex;
+                    }
+
+                    _ranges[rangeIndex].Level = run.Level;
+                }
+                else
+                {
+                    var r = new BidiRange(run.Level, runIndex, runIndex, previousRangeIndex: rangeIndex);
+                    _ranges.AddItem(r);
+                    rangeIndex = _ranges.Length - 1;
+                }
+
+                runIndex = nextRunIndex;
+            }
+
+            while (rangeIndex >= 0 && _ranges[rangeIndex].PreviousRangeIndex >= 0)
+            {
+                rangeIndex = MergeRangeWithPrevious(rangeIndex);
+            }
+
+            // Terminate.
+            _runs[_ranges[rangeIndex].RightRunIndex].NextRunIndex = -1;
+
+            return _runs[_ranges[rangeIndex].LeftRunIndex].RunIndex;
+        }
+
+        private int MergeRangeWithPrevious(int index)
+        {
+            var previousIndex = _ranges[index].PreviousRangeIndex;
+            ref var previous = ref _ranges[previousIndex];
+
+            int leftIndex;
+            int rightIndex;
+
+            if ((previous.Level & 1) != 0)
+            {
+                // Odd, previous goes to the right of range.
+                leftIndex = index;
+                rightIndex = previousIndex;
+            }
+            else
+            {
+                // Even, previous goes to the left of range.
+                leftIndex = previousIndex;
+                rightIndex = index;
+            }
+
+            // Stitch them
+            ref var left = ref _ranges[leftIndex];
+            ref var right = ref _ranges[rightIndex];
+            _runs[left.RightRunIndex].NextRunIndex = _runs[right.LeftRunIndex].RunIndex;
+            previous.LeftRunIndex = left.LeftRunIndex;
+            previous.RightRunIndex = right.RightRunIndex;
+
+            return previousIndex;
+        }
+
+        private struct OrderedBidiRun
+        {
+            public OrderedBidiRun(int runIndex, TextRun run, sbyte level)
+            {
+                RunIndex = runIndex;
+                Run = run;
+                Level = level;
+                NextRunIndex = -1;
+            }
+
+            public int RunIndex { get; }
+
+            public sbyte Level { get; }
+
+            public TextRun Run { get; }
+
+            public int NextRunIndex { get; set; } // -1 if none
+        }
+
+        private struct BidiRange
+        {
+            public BidiRange(sbyte level, int leftRunIndex, int rightRunIndex, int previousRangeIndex)
+            {
+                Level = level;
+                LeftRunIndex = leftRunIndex;
+                RightRunIndex = rightRunIndex;
+                PreviousRangeIndex = previousRangeIndex;
+            }
+
+            public sbyte Level { get; set; }
+
+            public int LeftRunIndex { get; set; }
+
+            public int RightRunIndex { get; set; }
+
+            public int PreviousRangeIndex { get; } // -1 if none
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
index 5c28989c7d..2f8c4ad263 100644
--- a/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
@@ -128,11 +128,9 @@ namespace Avalonia.Media.TextFormatting
 
             var graphemeEnumerator = new GraphemeEnumerator(text);
 
-            while (graphemeEnumerator.MoveNext())
+            while (graphemeEnumerator.MoveNext(out var grapheme))
             {
-                var grapheme = graphemeEnumerator.Current;
-
-                finalLength += grapheme.Text.Length;
+                finalLength += grapheme.Length;
 
                 if (finalLength >= length)
                 {
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattingBufferHelper.cs b/src/Avalonia.Base/Media/TextFormatting/FormattingBufferHelper.cs
new file mode 100644
index 0000000000..c27903cd55
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattingBufferHelper.cs
@@ -0,0 +1,84 @@
+using System.Collections.Generic;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal static class FormattingBufferHelper
+    {
+        // 1MB, arbitrary, that's 512K characters or 128K object references on x64
+        private const long MaxKeptBufferSizeInBytes = 1024 * 1024;
+
+        public static void ClearThenResetIfTooLarge<T>(ref ArrayBuilder<T> arrayBuilder)
+        {
+            arrayBuilder.Clear();
+
+            if (IsBufferTooLarge<T>((uint) arrayBuilder.Capacity))
+            {
+                arrayBuilder = default;
+            }
+        }
+
+        public static void ClearThenResetIfTooLarge<T>(List<T> list)
+        {
+            list.Clear();
+
+            if (IsBufferTooLarge<T>((uint) list.Capacity))
+            {
+                list.TrimExcess();
+            }
+        }
+
+        public static void ClearThenResetIfTooLarge<T>(Stack<T> stack)
+        {
+            var approximateCapacity = RoundUpToPowerOf2((uint)stack.Count);
+
+            stack.Clear();
+
+            if (IsBufferTooLarge<T>(approximateCapacity))
+            {
+                stack.TrimExcess();
+            }
+        }
+
+        public static void ClearThenResetIfTooLarge<TKey, TValue>(ref Dictionary<TKey, TValue> dictionary)
+            where TKey : notnull
+        {
+            var approximateCapacity = RoundUpToPowerOf2((uint)dictionary.Count);
+
+            dictionary.Clear();
+
+            // dictionary is in fact larger than that: it has entries and buckets, but let's only count our data here
+            if (IsBufferTooLarge<KeyValuePair<TKey, TValue>>(approximateCapacity))
+            {
+#if NET6_0_OR_GREATER
+                dictionary.TrimExcess();
+#else
+                dictionary = new Dictionary<TKey, TValue>();
+#endif
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsBufferTooLarge<T>(uint capacity)
+            => (long) (uint) Unsafe.SizeOf<T>() * capacity > MaxKeptBufferSizeInBytes;
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static uint RoundUpToPowerOf2(uint value)
+        {
+#if NET6_0_OR_GREATER
+            return BitOperations.RoundUpToPowerOf2(value);
+#else
+            // Based on https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+            --value;
+            value |= value >> 1;
+            value |= value >> 2;
+            value |= value >> 4;
+            value |= value >> 8;
+            value |= value >> 16;
+            return value + 1;
+#endif
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs b/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs
new file mode 100644
index 0000000000..c7cd58eb6d
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattingObjectPool.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// <para>Contains various list pools that are commonly used during text layout.</para>
+    /// <para>
+    /// This class provides an instance per thread.
+    /// In most applications, there'll be only one instance: on the UI thread, which is responsible for layout.
+    /// </para>
+    /// </summary>
+    /// <seealso cref="RentedList{T}"/>
+    internal sealed class FormattingObjectPool
+    {
+        [ThreadStatic] private static FormattingObjectPool? t_instance;
+
+        /// <summary>
+        /// Gets an instance of this class for the current thread.
+        /// </summary>
+        /// <remarks>
+        /// Since this is backed by a thread static field which is slower than a normal static field,
+        /// prefer passing the instance around when possible instead of calling this property each time.
+        /// </remarks>
+        public static FormattingObjectPool Instance
+            => t_instance ??= new();
+
+        public ListPool<TextRun> TextRunLists { get; } = new();
+
+        public ListPool<UnshapedTextRun> UnshapedTextRunLists { get; } = new();
+
+        public ListPool<TextLine> TextLines { get; } = new();
+
+        [Conditional("DEBUG")]
+        public void VerifyAllReturned()
+        {
+            TextRunLists.VerifyAllReturned();
+            UnshapedTextRunLists.VerifyAllReturned();
+            TextLines.VerifyAllReturned();
+        }
+
+        internal sealed class ListPool<T>
+        {
+            // we don't need a big number here, these are for temporary usages only which should quickly be returned
+            private const int MaxSize = 16;
+
+            private readonly RentedList<T>[] _lists = new RentedList<T>[MaxSize];
+            private int _size;
+            private int _pendingReturnCount;
+
+            /// <summary>
+            /// Rents a list.
+            /// See <see cref="RentedList{T}"/> for the intended usages.
+            /// </summary>
+            /// <returns>A rented list instance that must be returned to the pool.</returns>
+            /// <seealso cref="RentedList{T}"/>
+            public RentedList<T> Rent()
+            {
+                var list = _size > 0 ? _lists[--_size] : new RentedList<T>();
+
+                Debug.Assert(list.Count == 0, "A RentedList has been used after being returned!");
+
+                ++_pendingReturnCount;
+                return list;
+            }
+
+            /// <summary>
+            /// Returns a rented list to the pool.
+            /// </summary>
+            /// <param name="rentedList">
+            /// On input, the list to return.
+            /// On output, the reference is set to null to avoid misuse.
+            /// </param>
+            public void Return(ref RentedList<T>? rentedList)
+            {
+                if (rentedList is null)
+                {
+                    return;
+                }
+
+                --_pendingReturnCount;
+                FormattingBufferHelper.ClearThenResetIfTooLarge(rentedList);
+
+                if (_size < MaxSize)
+                {
+                    _lists[_size++] = rentedList;
+                }
+
+                rentedList = null;
+            }
+
+            [Conditional("DEBUG")]
+            public void VerifyAllReturned()
+            {
+                var pendingReturnCount = _pendingReturnCount;
+                _pendingReturnCount = 0;
+
+                if (pendingReturnCount > 0)
+                {
+                    throw new InvalidOperationException(
+                        $"{pendingReturnCount} RentedList<{typeof(T).Name}> haven't been returned to the pool!");
+                }
+
+                if (pendingReturnCount < 0)
+                {
+                    throw new InvalidOperationException(
+                        $"{-pendingReturnCount} RentedList<{typeof(T).Name}> extra lists have been returned to the pool!");
+                }
+            }
+        }
+
+        /// <summary>
+        /// <para>Represents a list that has been rented through <see cref="FormattingObjectPool"/>.</para>
+        /// <para>
+        /// This class can be used when a temporary list is needed to store some items during text layout.
+        /// It can also be used as a reusable array builder by calling <see cref="List{T}.ToArray"/> when done.
+        /// </para>
+        /// <list type="bullet">
+        ///   <item>NEVER use an instance of this type after it's been returned to the pool.</item>
+        ///   <item>AVOID storing an instance of this type into a field or property.</item>
+        ///   <item>AVOID casting an instance of this type to another type.</item>
+        ///   <item>
+        ///     AVOID passing an instance of this type as an argument to a method expecting a standard list,
+        ///     unless you're absolutely sure it won't store it.
+        ///   </item>
+        ///   <item>
+        ///     If you call a method returning an instance of this type,
+        ///     you're now responsible for returning it to the pool.
+        ///   </item>
+        /// </list>
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the list.</typeparam>
+        internal sealed class RentedList<T> : List<T>
+        {
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/GlyphInfo.cs b/src/Avalonia.Base/Media/TextFormatting/GlyphInfo.cs
new file mode 100644
index 0000000000..36a07721a6
--- /dev/null
+++ b/src/Avalonia.Base/Media/TextFormatting/GlyphInfo.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a single glyph.
+    /// </summary>
+    public readonly record struct GlyphInfo(ushort GlyphIndex, int GlyphCluster, double GlyphAdvance, Vector GlyphOffset = default)
+    {
+        internal static Comparer<GlyphInfo> ClusterAscendingComparer { get; } =
+            Comparer<GlyphInfo>.Create((x, y) => x.GlyphCluster.CompareTo(y.GlyphCluster));
+
+        internal static Comparer<GlyphInfo> ClusterDescendingComparer { get; } =
+            Comparer<GlyphInfo>.Create((x, y) => y.GlyphCluster.CompareTo(x.GlyphCluster));
+
+        /// <summary>
+        /// Get the glyph index.
+        /// </summary>
+        public ushort GlyphIndex { get; } = GlyphIndex;
+
+        /// <summary>
+        /// Get the glyph cluster.
+        /// </summary>
+        public int GlyphCluster { get; } = GlyphCluster;
+
+        /// <summary>
+        /// Get the glyph advance.
+        /// </summary>
+        public double GlyphAdvance { get; } = GlyphAdvance;
+
+        /// <summary>
+        /// Get the glyph offset.
+        /// </summary>
+        public Vector GlyphOffset { get; } = GlyphOffset;
+    }
+}
diff --git a/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs b/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
index b518d47a6d..efcd866bbc 100644
--- a/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
@@ -48,8 +48,9 @@ namespace Avalonia.Media.TextFormatting
 
             var currentPosition = textLine.FirstTextSourceIndex;
 
-            foreach (var textRun in lineImpl.TextRuns)
+            for (var i = 0; i < lineImpl.TextRuns.Count; ++i)
             {
+                var textRun = lineImpl.TextRuns[i];
                 var text = textRun.Text;
 
                 if (text.IsEmpty)
@@ -59,10 +60,8 @@ namespace Avalonia.Media.TextFormatting
 
                 var lineBreakEnumerator = new LineBreakEnumerator(text.Span);
 
-                while (lineBreakEnumerator.MoveNext())
+                while (lineBreakEnumerator.MoveNext(out var currentBreak))
                 {
-                    var currentBreak = lineBreakEnumerator.Current;
-
                     if (!currentBreak.Required && currentBreak.PositionWrap != textRun.Length)
                     {
                         breakOportunities.Enqueue(currentPosition + currentBreak.PositionMeasure);
@@ -111,7 +110,7 @@ namespace Avalonia.Media.TextFormatting
                         shapedBuffer.GlyphInfos[glyphIndex] = new GlyphInfo(glyphInfo.GlyphIndex, glyphInfo.GlyphCluster, glyphInfo.GlyphAdvance + spacing);
                     }
 
-                    glyphRun.GlyphAdvances = shapedBuffer.GlyphAdvances;
+                    glyphRun.GlyphInfos = shapedBuffer.GlyphInfos;
                 }
 
                 currentPosition += textRun.Length;
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
index b05fab08fa..f29bdd4459 100644
--- a/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedBuffer.cs
@@ -1,24 +1,23 @@
 using System;
 using System.Buffers;
+using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Utilities;
 
 namespace Avalonia.Media.TextFormatting
 {
-    public sealed class ShapedBuffer : IList<GlyphInfo>, IDisposable
+    public sealed class ShapedBuffer : IReadOnlyList<GlyphInfo>, IDisposable
     {
-        private static readonly IComparer<GlyphInfo> s_clusterComparer = new CompareClusters();
-        private bool _bufferRented;
-
-        public ShapedBuffer(ReadOnlyMemory<char> text, int bufferLength, IGlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel) :
-            this(text,
-                new ArraySlice<GlyphInfo>(ArrayPool<GlyphInfo>.Shared.Rent(bufferLength), 0, bufferLength),
-                glyphTypeface,
-                fontRenderingEmSize,
-                bidiLevel)
+        private GlyphInfo[]? _rentedBuffer;
+
+        public ShapedBuffer(ReadOnlyMemory<char> text, int bufferLength, IGlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel)
         {
-            _bufferRented = true;
-            Length = bufferLength;
+            _rentedBuffer = ArrayPool<GlyphInfo>.Shared.Rent(bufferLength);
+            Text = text;
+            GlyphInfos = new ArraySlice<GlyphInfo>(_rentedBuffer, 0, bufferLength);
+            GlyphTypeface = glyphTypeface;
+            FontRenderingEmSize = fontRenderingEmSize;
+            BidiLevel = bidiLevel;
         }
 
         internal ShapedBuffer(ReadOnlyMemory<char> text, ArraySlice<GlyphInfo> glyphInfos, IGlyphTypeface glyphTypeface, double fontRenderingEmSize, sbyte bidiLevel)
@@ -28,12 +27,12 @@ namespace Avalonia.Media.TextFormatting
             GlyphTypeface = glyphTypeface;
             FontRenderingEmSize = fontRenderingEmSize;
             BidiLevel = bidiLevel;
-            Length = GlyphInfos.Length;
         }
 
-        internal ArraySlice<GlyphInfo> GlyphInfos { get; }
-        
-        public int Length { get; }
+        internal ArraySlice<GlyphInfo> GlyphInfos { get; private set; }
+
+        public int Length
+            => GlyphInfos.Length;
 
         public IGlyphTypeface GlyphTypeface { get; }
 
@@ -42,14 +41,6 @@ namespace Avalonia.Media.TextFormatting
         public sbyte BidiLevel { get; }
 
         public bool IsLeftToRight => (BidiLevel & 1) == 0;
-        
-        public IReadOnlyList<ushort> GlyphIndices => new GlyphIndexList(GlyphInfos);
-
-        public IReadOnlyList<int> GlyphClusters => new GlyphClusterList(GlyphInfos);
-
-        public IReadOnlyList<double> GlyphAdvances => new GlyphAdvanceList(GlyphInfos);
-
-        public IReadOnlyList<Vector> GlyphOffsets => new GlyphOffsetList(GlyphInfos);
 
         public ReadOnlyMemory<char> Text { get; }
         
@@ -73,13 +64,13 @@ namespace Avalonia.Media.TextFormatting
             }
 
 
-            var comparer = s_clusterComparer;
+            var comparer = GlyphInfo.ClusterAscendingComparer;
 
-            var clusters = GlyphInfos.Span;
+            var glyphInfos = GlyphInfos.Span;
 
-            var searchValue = new GlyphInfo(0, characterIndex);
+            var searchValue = new GlyphInfo(default, characterIndex, default);
 
-            var start = clusters.BinarySearch(searchValue, comparer);
+            var start = glyphInfos.BinarySearch(searchValue, comparer);
 
             if (start < 0)
             {
@@ -87,9 +78,9 @@ namespace Avalonia.Media.TextFormatting
                 {
                     characterIndex--;
 
-                    searchValue = new GlyphInfo(0, characterIndex);
+                    searchValue = new GlyphInfo(default, characterIndex, default);
 
-                    start = clusters.BinarySearch(searchValue, comparer);
+                    start = glyphInfos.BinarySearch(searchValue, comparer);
                 }
 
                 if (start < 0)
@@ -98,7 +89,7 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
-            while (start > 0 && clusters[start - 1].GlyphCluster == clusters[start].GlyphCluster)
+            while (start > 0 && glyphInfos[start - 1].GlyphCluster == glyphInfos[start].GlyphCluster)
             {
                 start--;
             }
@@ -118,8 +109,8 @@ namespace Avalonia.Media.TextFormatting
                 return new SplitResult<ShapedBuffer>(this, null);
             }
 
-            var firstCluster = GlyphClusters[0];
-            var lastCluster = GlyphClusters[GlyphClusters.Count - 1];
+            var firstCluster = GlyphInfos[0].GlyphCluster;
+            var lastCluster = GlyphInfos[GlyphInfos.Length - 1].GlyphCluster;
 
             var start = firstCluster < lastCluster ? firstCluster : lastCluster;
 
@@ -134,9 +125,7 @@ namespace Avalonia.Media.TextFormatting
             return new SplitResult<ShapedBuffer>(first, second);
         }
 
-        int ICollection<GlyphInfo>.Count => throw new NotImplementedException();
-
-        bool ICollection<GlyphInfo>.IsReadOnly => true;
+        int IReadOnlyCollection<GlyphInfo>.Count => GlyphInfos.Length;
 
         public GlyphInfo this[int index]
         {
@@ -144,177 +133,18 @@ namespace Avalonia.Media.TextFormatting
             set => GlyphInfos[index] = value;
         }
 
-        int IList<GlyphInfo>.IndexOf(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void IList<GlyphInfo>.Insert(int index, GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void IList<GlyphInfo>.RemoveAt(int index)
-        {
-            throw new NotImplementedException();
-        }
-
-        void ICollection<GlyphInfo>.Add(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void ICollection<GlyphInfo>.Clear()
-        {
-            throw new NotImplementedException();
-        }
-
-        bool ICollection<GlyphInfo>.Contains(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
-
-        void ICollection<GlyphInfo>.CopyTo(GlyphInfo[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        bool ICollection<GlyphInfo>.Remove(GlyphInfo item)
-        {
-            throw new NotImplementedException();
-        }
         public IEnumerator<GlyphInfo> GetEnumerator() => GlyphInfos.GetEnumerator();
 
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-
-        private class CompareClusters : IComparer<GlyphInfo>
-        {
-            private static readonly Comparer<int> s_intClusterComparer = Comparer<int>.Default;
-
-            public int Compare(GlyphInfo x, GlyphInfo y)
-            {
-                return s_intClusterComparer.Compare(x.GlyphCluster, y.GlyphCluster);
-            }
-        }
-
-        private readonly struct GlyphAdvanceList : IReadOnlyList<double>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphAdvanceList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public double this[int index] => _glyphInfos[index].GlyphAdvance;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<double> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<double>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-
-        private readonly struct GlyphIndexList : IReadOnlyList<ushort>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphIndexList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public ushort this[int index] => _glyphInfos[index].GlyphIndex;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<ushort> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<ushort>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-
-        private readonly struct GlyphClusterList : IReadOnlyList<int>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphClusterList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public int this[int index] => _glyphInfos[index].GlyphCluster;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<int> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<int>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-
-        private readonly struct GlyphOffsetList : IReadOnlyList<Vector>
-        {
-            private readonly ArraySlice<GlyphInfo> _glyphInfos;
-
-            public GlyphOffsetList(ArraySlice<GlyphInfo> glyphInfos)
-            {
-                _glyphInfos = glyphInfos;
-            }
-
-            public Vector this[int index] => _glyphInfos[index].GlyphOffset;
-
-            public int Count => _glyphInfos.Length;
-
-            public IEnumerator<Vector> GetEnumerator() => new ImmutableReadOnlyListStructEnumerator<Vector>(this);
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
         public void Dispose()
         {
-            GC.SuppressFinalize(this);
-            if (_bufferRented)
+            if (_rentedBuffer is not null)
             {
-                GlyphInfos.ReturnRent();
+                ArrayPool<GlyphInfo>.Shared.Return(_rentedBuffer);
+                _rentedBuffer = null;
+                GlyphInfos = ArraySlice<GlyphInfo>.Empty; // ensure we don't misuse the returned array
             }
         }
-
-        ~ShapedBuffer()
-        {
-            if (_bufferRented)
-            {
-                GlyphInfos.ReturnRent();
-            }
-        }
-    }
-
-    public readonly record struct GlyphInfo
-    {
-        public GlyphInfo(ushort glyphIndex, int glyphCluster, double glyphAdvance = 0, Vector glyphOffset = default)
-        {
-            GlyphIndex = glyphIndex;
-            GlyphAdvance = glyphAdvance;
-            GlyphCluster = glyphCluster;
-            GlyphOffset = glyphOffset;
-        }
-
-        /// <summary>
-        /// Get the glyph index.
-        /// </summary>
-        public ushort GlyphIndex { get; }
-
-        /// <summary>
-        /// Get the glyph cluster.
-        /// </summary>
-        public int GlyphCluster { get; }
-
-        /// <summary>
-        /// Get the glyph advance.
-        /// </summary>
-        public double GlyphAdvance { get; }
-
-        /// <summary>
-        /// Get the glyph offset.
-        /// </summary>
-        public Vector GlyphOffset { get; }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
index 583f2e49f1..7f23ac98b4 100644
--- a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Media.TextFormatting
         {
             ShapedBuffer = shapedBuffer;
             Properties = properties;
-            TextMetrics = new TextMetrics(properties.Typeface.GlyphTypeface, properties.FontRenderingEmSize);
+            TextMetrics = new TextMetrics(properties.CachedGlyphTypeface, properties.FontRenderingEmSize);
         }
 
         public bool IsReversed { get; private set; }
@@ -40,25 +40,14 @@ namespace Avalonia.Media.TextFormatting
 
         public override Size Size => GlyphRun.Size;
 
-        public GlyphRun GlyphRun
-        {
-            get
-            {
-                if(_glyphRun is null)
-                {
-                    _glyphRun = CreateGlyphRun();
-                }
-
-                return _glyphRun;
-            }
-        }
+        public GlyphRun GlyphRun => _glyphRun ??= CreateGlyphRun();
 
         /// <inheritdoc/>
         public override void Draw(DrawingContext drawingContext, Point origin)
         {
             using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
             {
-                if (GlyphRun.GlyphIndices.Count == 0)
+                if (GlyphRun.GlyphInfos.Count == 0)
                 {
                     return;
                 }
@@ -117,7 +106,7 @@ namespace Avalonia.Media.TextFormatting
 
             for (var i = 0; i < ShapedBuffer.Length; i++)
             {
-                var advance = ShapedBuffer.GlyphAdvances[i];
+                var advance = ShapedBuffer.GlyphInfos[i].GlyphAdvance;
 
                 if (currentWidth + advance > availableWidth)
                 {
@@ -141,7 +130,7 @@ namespace Avalonia.Media.TextFormatting
 
             for (var i = ShapedBuffer.Length - 1; i >= 0; i--)
             {
-                var advance = ShapedBuffer.GlyphAdvances[i];
+                var advance = ShapedBuffer.GlyphInfos[i].GlyphAdvance;
 
                 if (width + advance > availableWidth)
                 {
@@ -195,11 +184,8 @@ namespace Avalonia.Media.TextFormatting
                 ShapedBuffer.GlyphTypeface,
                 ShapedBuffer.FontRenderingEmSize,
                 Text,
-                ShapedBuffer.GlyphIndices,
-                ShapedBuffer.GlyphAdvances,
-                ShapedBuffer.GlyphOffsets,
-                ShapedBuffer.GlyphClusters,
-                BidiLevel);
+                ShapedBuffer,
+                biDiLevel: BidiLevel);
         }
 
         public void Dispose()
diff --git a/src/Avalonia.Base/Media/TextFormatting/SplitResult.cs b/src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
index 53021c4656..c1ac57ce46 100644
--- a/src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/SplitResult.cs
@@ -26,5 +26,16 @@
         /// The second part.
         /// </value>
         public T? Second { get; }
+
+        /// <summary>
+        /// Deconstructs the split results into its components.
+        /// </summary>
+        /// <param name="first">On return, contains the first part.</param>
+        /// <param name="second">On return, contains the second part.</param>
+        public void Deconstruct(out T first, out T? second)
+        {
+            first = First;
+            second = Second;
+        }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
index 2525f0dbf9..82cf3297fd 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using Avalonia.Media.TextFormatting.Unicode;
+using static Avalonia.Media.TextFormatting.FormattingObjectPool;
 
 namespace Avalonia.Media.TextFormatting
 {
@@ -46,24 +46,21 @@ namespace Avalonia.Media.TextFormatting
         /// Gets a list of <see cref="UnshapedTextRun"/>.
         /// </summary>
         /// <returns>The shapeable text characters.</returns>
-        internal IReadOnlyList<UnshapedTextRun> GetShapeableCharacters(ReadOnlyMemory<char> text, sbyte biDiLevel,
-            ref TextRunProperties? previousProperties)
+        internal void GetShapeableCharacters(ReadOnlyMemory<char> text, sbyte biDiLevel,
+            FontManager fontManager, ref TextRunProperties? previousProperties, RentedList<TextRun> results)
         {
-            var shapeableCharacters = new List<UnshapedTextRun>(2);
             var properties = Properties;
 
             while (!text.IsEmpty)
             {
-                var shapeableRun = CreateShapeableRun(text, properties, biDiLevel, ref previousProperties);
+                var shapeableRun = CreateShapeableRun(text, properties, biDiLevel, fontManager, ref previousProperties);
 
-                shapeableCharacters.Add(shapeableRun);
+                results.Add(shapeableRun);
 
                 text = text.Slice(shapeableRun.Length);
 
                 previousProperties = shapeableRun.Properties;
             }
-
-            return shapeableCharacters;
         }
 
         /// <summary>
@@ -72,37 +69,40 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="text">The characters to create text runs from.</param>
         /// <param name="defaultProperties">The default text run properties.</param>
         /// <param name="biDiLevel">The bidi level of the run.</param>
+        /// <param name="fontManager">The font manager to use.</param>
         /// <param name="previousProperties"></param>
         /// <returns>A list of shapeable text runs.</returns>
         private static UnshapedTextRun CreateShapeableRun(ReadOnlyMemory<char> text,
-            TextRunProperties defaultProperties, sbyte biDiLevel, ref TextRunProperties? previousProperties)
+            TextRunProperties defaultProperties, sbyte biDiLevel, FontManager fontManager,
+            ref TextRunProperties? previousProperties)
         {
             var defaultTypeface = defaultProperties.Typeface;
-            var currentTypeface = defaultTypeface;
+            var defaultGlyphTypeface = defaultProperties.CachedGlyphTypeface;
             var previousTypeface = previousProperties?.Typeface;
+            var previousGlyphTypeface = previousProperties?.CachedGlyphTypeface;
             var textSpan = text.Span;
 
-            if (TryGetShapeableLength(textSpan, currentTypeface, null, out var count, out var script))
+            if (TryGetShapeableLength(textSpan, defaultGlyphTypeface, null, out var count, out var script))
             {
-                if (script == Script.Common && previousTypeface is not null)
+                if (script == Script.Common && previousGlyphTypeface is not null)
                 {
-                    if (TryGetShapeableLength(textSpan, previousTypeface.Value, null, out var fallbackCount, out _))
+                    if (TryGetShapeableLength(textSpan, previousGlyphTypeface, null, out var fallbackCount, out _))
                     {
                         return new UnshapedTextRun(text.Slice(0, fallbackCount),
-                            defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
+                            defaultProperties.WithTypeface(previousTypeface!.Value), biDiLevel);
                     }
                 }
 
-                return new UnshapedTextRun(text.Slice(0, count), defaultProperties.WithTypeface(currentTypeface),
+                return new UnshapedTextRun(text.Slice(0, count), defaultProperties.WithTypeface(defaultTypeface),
                     biDiLevel);
             }
 
-            if (previousTypeface is not null)
+            if (previousGlyphTypeface is not null)
             {
-                if (TryGetShapeableLength(textSpan, previousTypeface.Value, defaultTypeface, out count, out _))
+                if (TryGetShapeableLength(textSpan, previousGlyphTypeface, defaultGlyphTypeface, out count, out _))
                 {
                     return new UnshapedTextRun(text.Slice(0, count),
-                        defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
+                        defaultProperties.WithTypeface(previousTypeface!.Value), biDiLevel);
                 }
             }
 
@@ -110,48 +110,44 @@ namespace Avalonia.Media.TextFormatting
 
             var codepointEnumerator = new CodepointEnumerator(text.Slice(count).Span);
 
-            while (codepointEnumerator.MoveNext())
+            while (codepointEnumerator.MoveNext(out var cp))
             {
-                if (codepointEnumerator.Current.IsWhiteSpace)
+                if (cp.IsWhiteSpace)
                 {
                     continue;
                 }
 
-                codepoint = codepointEnumerator.Current;
+                codepoint = cp;
 
                 break;
             }
 
             //ToDo: Fix FontFamily fallback
             var matchFound =
-                FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
+                fontManager.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
                     defaultTypeface.Stretch, defaultTypeface.FontFamily, defaultProperties.CultureInfo,
-                    out currentTypeface);
+                    out var fallbackTypeface);
 
-            if (matchFound && TryGetShapeableLength(textSpan, currentTypeface, defaultTypeface, out count, out _))
+            var fallbackGlyphTypeface = fontManager.GetOrAddGlyphTypeface(fallbackTypeface);
+
+            if (matchFound && TryGetShapeableLength(textSpan, fallbackGlyphTypeface, defaultGlyphTypeface, out count, out _))
             {
                 //Fallback found
-                return new UnshapedTextRun(text.Slice(0, count), defaultProperties.WithTypeface(currentTypeface),
+                return new UnshapedTextRun(text.Slice(0, count), defaultProperties.WithTypeface(fallbackTypeface),
                     biDiLevel);
             }
 
             // no fallback found
-            currentTypeface = defaultTypeface;
-
-            var glyphTypeface = currentTypeface.GlyphTypeface;
-
             var enumerator = new GraphemeEnumerator(textSpan);
 
-            while (enumerator.MoveNext())
+            while (enumerator.MoveNext(out var grapheme))
             {
-                var grapheme = enumerator.Current;
-
-                if (!grapheme.FirstCodepoint.IsWhiteSpace && glyphTypeface.TryGetGlyph(grapheme.FirstCodepoint, out _))
+                if (!grapheme.FirstCodepoint.IsWhiteSpace && defaultGlyphTypeface.TryGetGlyph(grapheme.FirstCodepoint, out _))
                 {
                     break;
                 }
 
-                count += grapheme.Text.Length;
+                count += grapheme.Length;
             }
 
             return new UnshapedTextRun(text.Slice(0, count), defaultProperties, biDiLevel);
@@ -161,15 +157,15 @@ namespace Avalonia.Media.TextFormatting
         /// Tries to get a shapeable length that is supported by the specified typeface.
         /// </summary>
         /// <param name="text">The characters to shape.</param>
-        /// <param name="typeface">The typeface that is used to find matching characters.</param>
-        /// <param name="defaultTypeface"></param>
+        /// <param name="glyphTypeface">The typeface that is used to find matching characters.</param>
+        /// <param name="defaultGlyphTypeface">The default typeface.</param>
         /// <param name="length">The shapeable length.</param>
         /// <param name="script"></param>
         /// <returns></returns>
         internal static bool TryGetShapeableLength(
             ReadOnlySpan<char> text,
-            Typeface typeface,
-            Typeface? defaultTypeface,
+            IGlyphTypeface glyphTypeface,
+            IGlyphTypeface? defaultGlyphTypeface,
             out int length,
             out Script script)
         {
@@ -181,24 +177,22 @@ namespace Avalonia.Media.TextFormatting
                 return false;
             }
 
-            var font = typeface.GlyphTypeface;
-            var defaultFont = defaultTypeface?.GlyphTypeface;
-
             var enumerator = new GraphemeEnumerator(text);
 
-            while (enumerator.MoveNext())
+            while (enumerator.MoveNext(out var currentGrapheme))
             {
-                var currentGrapheme = enumerator.Current;
-
-                var currentScript = currentGrapheme.FirstCodepoint.Script;
+                var currentCodepoint = currentGrapheme.FirstCodepoint;
+                var currentScript = currentCodepoint.Script;
 
-                if (!currentGrapheme.FirstCodepoint.IsWhiteSpace && defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                if (!currentCodepoint.IsWhiteSpace
+                    && defaultGlyphTypeface != null
+                    && defaultGlyphTypeface.TryGetGlyph(currentCodepoint, out _))
                 {
                     break;
                 }
 
                 //Stop at the first missing glyph
-                if (!currentGrapheme.FirstCodepoint.IsBreakChar && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                if (!currentCodepoint.IsBreakChar && !glyphTypeface.TryGetGlyph(currentCodepoint, out _))
                 {
                     break;
                 }
@@ -219,7 +213,7 @@ namespace Avalonia.Media.TextFormatting
                     }
                 }
 
-                length += currentGrapheme.Text.Length;
+                length += currentGrapheme.Length;
             }
 
             return length > 0;
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
index 01804e1ce3..72882df0b5 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting
+namespace Avalonia.Media.TextFormatting
 {
     /// <summary>
     /// Properties of text collapsing.
@@ -21,6 +19,6 @@ namespace Avalonia.Media.TextFormatting
         /// Collapses given text line.
         /// </summary>
         /// <param name="textLine">Text line to collapse.</param>
-        public abstract List<TextRun>? Collapse(TextLine textLine);
+        public abstract TextRun[]? Collapse(TextLine textLine);
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
index 528cd45581..4c93a1d851 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
@@ -1,15 +1,16 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Avalonia.Media.TextFormatting.Unicode;
 
 namespace Avalonia.Media.TextFormatting
 {
     internal static class TextEllipsisHelper
     {
-        public static List<TextRun>? Collapse(TextLine textLine, TextCollapsingProperties properties, bool isWordEllipsis)
+        public static TextRun[]? Collapse(TextLine textLine, TextCollapsingProperties properties, bool isWordEllipsis)
         {
             var textRuns = textLine.TextRuns;
 
-            if (textRuns == null || textRuns.Count == 0)
+            if (textRuns.Count == 0)
             {
                 return null;
             }
@@ -22,7 +23,7 @@ namespace Avalonia.Media.TextFormatting
             if (properties.Width < shapedSymbol.GlyphRun.Size.Width)
             {
                 //Not enough space to fit in the symbol
-                return new List<TextRun>(0);
+                return Array.Empty<TextRun>();
             }
 
             var availableWidth = properties.Width - shapedSymbol.Size.Width;
@@ -47,9 +48,9 @@ namespace Avalonia.Media.TextFormatting
 
                                         var lineBreaker = new LineBreakEnumerator(currentRun.Text.Span);
 
-                                        while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
+                                        while (currentBreakPosition < measuredLength && lineBreaker.MoveNext(out var lineBreak))
                                         {
-                                            var nextBreakPosition = lineBreaker.Current.PositionMeasure;
+                                            var nextBreakPosition = lineBreak.PositionMeasure;
 
                                             if (nextBreakPosition == 0)
                                             {
@@ -70,18 +71,7 @@ namespace Avalonia.Media.TextFormatting
 
                                 collapsedLength += measuredLength;
 
-                                var collapsedRuns = new List<TextRun>(textRuns.Count);
-
-                                if (collapsedLength > 0)
-                                {
-                                    var splitResult = TextFormatterImpl.SplitTextRuns(textRuns, collapsedLength);
-
-                                    collapsedRuns.AddRange(splitResult.First);
-                                }
-
-                                collapsedRuns.Add(shapedSymbol);
-
-                                return collapsedRuns;
+                                return CreateCollapsedRuns(textRuns, collapsedLength, shapedSymbol);
                             }
 
                             availableWidth -= shapedRun.Size.Width;
@@ -94,18 +84,7 @@ namespace Avalonia.Media.TextFormatting
                             //The whole run needs to fit into available space
                             if (currentWidth + drawableRun.Size.Width > availableWidth)
                             {
-                                var collapsedRuns = new List<TextRun>(textRuns.Count);
-
-                                if (collapsedLength > 0)
-                                {
-                                    var splitResult = TextFormatterImpl.SplitTextRuns(textRuns, collapsedLength);
-
-                                    collapsedRuns.AddRange(splitResult.First);
-                                }
-
-                                collapsedRuns.Add(shapedSymbol);
-
-                                return collapsedRuns;
+                                return CreateCollapsedRuns(textRuns, collapsedLength, shapedSymbol);
                             }
 
                             availableWidth -= drawableRun.Size.Width;
@@ -121,5 +100,31 @@ namespace Avalonia.Media.TextFormatting
 
             return null;
         }
+
+        private static TextRun[] CreateCollapsedRuns(IReadOnlyList<TextRun> textRuns, int collapsedLength,
+            TextRun shapedSymbol)
+        {
+            if (collapsedLength <= 0)
+            {
+                return new[] { shapedSymbol };
+            }
+
+            var objectPool = FormattingObjectPool.Instance;
+
+            var (preSplitRuns, postSplitRuns) = TextFormatterImpl.SplitTextRuns(textRuns, collapsedLength, objectPool);
+
+            try
+            {
+                var collapsedRuns = new TextRun[preSplitRuns.Count + 1];
+                preSplitRuns.CopyTo(collapsedRuns);
+                collapsedRuns[collapsedRuns.Length - 1] = shapedSymbol;
+                return collapsedRuns;
+            }
+            finally
+            {
+                objectPool.TextRunLists.Return(ref preSplitRuns);
+                objectPool.TextRunLists.Return(ref postSplitRuns);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
index 8afecb09e2..7505b9ccdd 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
@@ -1,15 +1,22 @@
-using System;
+// ReSharper disable ForCanBeConvertedToForeach
+using System;
 using System.Buffers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Utilities;
+using static Avalonia.Media.TextFormatting.FormattingObjectPool;
 
 namespace Avalonia.Media.TextFormatting
 {
-    internal class TextFormatterImpl : TextFormatter
+    internal sealed class TextFormatterImpl : TextFormatter
     {
         private static readonly char[] s_empty = { ' ' };
+        private static readonly char[] s_defaultText = new char[TextRun.DefaultTextSourceLength];
+
+        [ThreadStatic] private static BidiData? t_bidiData;
+        [ThreadStatic] private static BidiAlgorithm? t_bidiAlgorithm;
 
         /// <inheritdoc cref="TextFormatter.FormatLine"/>
         public override TextLine FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
@@ -18,52 +25,71 @@ namespace Avalonia.Media.TextFormatting
             var textWrapping = paragraphProperties.TextWrapping;
             FlowDirection resolvedFlowDirection;
             TextLineBreak? nextLineBreak = null;
-            IReadOnlyList<TextRun> textRuns;
+            IReadOnlyList<TextRun>? textRuns;
+            var objectPool = FormattingObjectPool.Instance;
+            var fontManager = FontManager.Current;
 
-            var fetchedRuns = FetchTextRuns(textSource, firstTextSourceIndex,
+            var fetchedRuns = FetchTextRuns(textSource, firstTextSourceIndex, objectPool,
                 out var textEndOfLine, out var textSourceLength);
 
-            if (previousLineBreak?.RemainingRuns != null)
-            {
-                resolvedFlowDirection = previousLineBreak.FlowDirection;
-                textRuns = previousLineBreak.RemainingRuns;
-                nextLineBreak = previousLineBreak;
-            }
-            else
-            {
-                textRuns = ShapeTextRuns(fetchedRuns, paragraphProperties, out resolvedFlowDirection);
+            RentedList<TextRun>? shapedTextRuns = null;
 
-                if (nextLineBreak == null && textEndOfLine != null)
+            try
+            {
+                if (previousLineBreak?.RemainingRuns is { } remainingRuns)
                 {
-                    nextLineBreak = new TextLineBreak(textEndOfLine, resolvedFlowDirection);
+                    resolvedFlowDirection = previousLineBreak.FlowDirection;
+                    textRuns = remainingRuns;
+                    nextLineBreak = previousLineBreak;
+                    shapedTextRuns = null;
                 }
-            }
+                else
+                {
+                    shapedTextRuns = ShapeTextRuns(fetchedRuns, paragraphProperties, objectPool, fontManager,
+                        out resolvedFlowDirection);
+                    textRuns = shapedTextRuns;
 
-            TextLineImpl textLine;
+                    if (nextLineBreak == null && textEndOfLine != null)
+                    {
+                        nextLineBreak = new TextLineBreak(textEndOfLine, resolvedFlowDirection);
+                    }
+                }
 
-            switch (textWrapping)
-            {
-                case TextWrapping.NoWrap:
+                TextLineImpl textLine;
+
+                switch (textWrapping)
+                {
+                    case TextWrapping.NoWrap:
                     {
-                        textLine = new TextLineImpl(textRuns, firstTextSourceIndex, textSourceLength,
+                        // perf note: if textRuns comes from remainingRuns above, it's very likely coming from this class
+                        // which already uses an array: ToArray() won't ever be called in this case
+                        var textRunArray = textRuns as TextRun[] ?? textRuns.ToArray();
+
+                        textLine = new TextLineImpl(textRunArray, firstTextSourceIndex, textSourceLength,
                             paragraphWidth, paragraphProperties, resolvedFlowDirection, nextLineBreak);
 
                         textLine.FinalizeLine();
 
                         break;
                     }
-                case TextWrapping.WrapWithOverflow:
-                case TextWrapping.Wrap:
+                    case TextWrapping.WrapWithOverflow:
+                    case TextWrapping.Wrap:
                     {
-                        textLine = PerformTextWrapping(textRuns, firstTextSourceIndex, paragraphWidth, paragraphProperties,
-                            resolvedFlowDirection, nextLineBreak);
+                        textLine = PerformTextWrapping(textRuns, firstTextSourceIndex, paragraphWidth,
+                            paragraphProperties, resolvedFlowDirection, nextLineBreak, objectPool, fontManager);
                         break;
                     }
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(textWrapping));
-            }
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(textWrapping));
+                }
 
-            return textLine;
+                return textLine;
+            }
+            finally
+            {
+                objectPool.TextRunLists.Return(ref shapedTextRuns);
+                objectPool.TextRunLists.Return(ref fetchedRuns);
+            }
         }
 
         /// <summary>
@@ -71,9 +97,12 @@ namespace Avalonia.Media.TextFormatting
         /// </summary>
         /// <param name="textRuns">The text run's.</param>
         /// <param name="length">The length to split at.</param>
+        /// <param name="objectPool">A pool used to get reusable formatting objects.</param>
         /// <returns>The split text runs.</returns>
-        internal static SplitResult<IReadOnlyList<TextRun>> SplitTextRuns(IReadOnlyList<TextRun> textRuns, int length)
+        internal static SplitResult<RentedList<TextRun>> SplitTextRuns(IReadOnlyList<TextRun> textRuns, int length,
+            FormattingObjectPool objectPool)
         {
+            var first = objectPool.TextRunLists.Rent();
             var currentLength = 0;
 
             for (var i = 0; i < textRuns.Count; i++)
@@ -89,8 +118,6 @@ namespace Avalonia.Media.TextFormatting
 
                 var firstCount = currentRun.Length >= 1 ? i + 1 : i;
 
-                var first = new List<TextRun>(firstCount);
-
                 if (firstCount > 1)
                 {
                     for (var j = 0; j < i; j++)
@@ -103,7 +130,7 @@ namespace Avalonia.Media.TextFormatting
 
                 if (currentLength + currentRun.Length == length)
                 {
-                    var second = secondCount > 0 ? new List<TextRun>(secondCount) : null;
+                    var second = secondCount > 0 ? objectPool.TextRunLists.Rent() : null;
 
                     if (second != null)
                     {
@@ -117,13 +144,13 @@ namespace Avalonia.Media.TextFormatting
 
                     first.Add(currentRun);
 
-                    return new SplitResult<IReadOnlyList<TextRun>>(first, second);
+                    return new SplitResult<RentedList<TextRun>>(first, second);
                 }
                 else
                 {
                     secondCount++;
 
-                    var second = new List<TextRun>(secondCount);
+                    var second = objectPool.TextRunLists.Rent();
 
                     if (currentRun is ShapedTextRun shapedTextCharacters)
                     {
@@ -139,11 +166,16 @@ namespace Avalonia.Media.TextFormatting
                         second.Add(textRuns[i + j]);
                     }
 
-                    return new SplitResult<IReadOnlyList<TextRun>>(first, second);
+                    return new SplitResult<RentedList<TextRun>>(first, second);
                 }
             }
 
-            return new SplitResult<IReadOnlyList<TextRun>>(textRuns, null);
+            for (var i = 0; i < textRuns.Count; i++)
+            {
+                first.Add(textRuns[i]);
+            }
+
+            return new SplitResult<RentedList<TextRun>>(first, null);
         }
 
         /// <summary>
@@ -152,51 +184,77 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="textRuns">The text runs to shape.</param>
         /// <param name="paragraphProperties">The default paragraph properties.</param>
         /// <param name="resolvedFlowDirection">The resolved flow direction.</param>
+        /// <param name="objectPool">A pool used to get reusable formatting objects.</param>
+        /// <param name="fontManager">The font manager to use.</param>
         /// <returns>
         /// A list of shaped text characters.
         /// </returns>
-        private static List<TextRun> ShapeTextRuns(List<TextRun> textRuns, TextParagraphProperties paragraphProperties,
-            out FlowDirection resolvedFlowDirection)
+        private static RentedList<TextRun> ShapeTextRuns(IReadOnlyList<TextRun> textRuns,
+            TextParagraphProperties paragraphProperties, FormattingObjectPool objectPool,
+            FontManager fontManager, out FlowDirection resolvedFlowDirection)
         {
             var flowDirection = paragraphProperties.FlowDirection;
-            var shapedRuns = new List<TextRun>();
-            using var biDiData = new BidiData((sbyte)flowDirection);
+            var shapedRuns = objectPool.TextRunLists.Rent();
 
-            foreach (var textRun in textRuns)
+            if (textRuns.Count == 0)
             {
-                if (textRun.Text.IsEmpty)
-                {
-                    biDiData.Append(new char[textRun.Length]);
-                }
-                else
-                {
-                    biDiData.Append(textRun.Text.Span);
-                }
+                resolvedFlowDirection = flowDirection;
+                return shapedRuns;
             }
 
-            using var biDi = new BidiAlgorithm();
+            var bidiData = t_bidiData ??= new();
+            bidiData.Reset();
+            bidiData.ParagraphEmbeddingLevel = (sbyte)flowDirection;
 
-            biDi.Process(biDiData);
+            for (var i = 0; i < textRuns.Count; ++i)
+            {
+                var textRun = textRuns[i];
 
-            var resolvedEmbeddingLevel = biDi.ResolveEmbeddingLevel(biDiData.Classes);
+                ReadOnlySpan<char> text;
+                if (!textRun.Text.IsEmpty)
+                    text = textRun.Text.Span;
+                else if (textRun.Length == TextRun.DefaultTextSourceLength)
+                    text = s_defaultText;
+                else
+                    text = new char[textRun.Length];
+
+                bidiData.Append(text);
+            }
+
+            var bidiAlgorithm = t_bidiAlgorithm ??= new();
+            bidiAlgorithm.Process(bidiData);
+
+            var resolvedEmbeddingLevel = bidiAlgorithm.ResolveEmbeddingLevel(bidiData.Classes);
 
             resolvedFlowDirection =
                 (resolvedEmbeddingLevel & 1) == 0 ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
 
-            var processedRuns = new List<TextRun>(textRuns.Count);
-
-            CoalesceLevels(textRuns, biDi.ResolvedLevels, processedRuns);
+            var processedRuns = objectPool.TextRunLists.Rent();
+            var groupedRuns = objectPool.UnshapedTextRunLists.Rent();
 
-            for (var index = 0; index < processedRuns.Count; index++)
+            try
             {
-                var currentRun = processedRuns[index];
+                CoalesceLevels(textRuns, bidiAlgorithm.ResolvedLevels.Span, fontManager, processedRuns);
 
-                switch (currentRun)
+                bidiData.Reset();
+                bidiAlgorithm.Reset();
+
+
+                var textShaper = TextShaper.Current;
+
+                for (var index = 0; index < processedRuns.Count; index++)
                 {
-                    case UnshapedTextRun shapeableRun:
+                    var currentRun = processedRuns[index];
+
+                    switch (currentRun)
+                    {
+                        case UnshapedTextRun shapeableRun:
                         {
-                            var groupedRuns = new List<UnshapedTextRun>(2) { shapeableRun };
+                            groupedRuns.Clear();
+                            groupedRuns.Add(shapeableRun);
+
                             var text = shapeableRun.Text;
+                            var properties = shapeableRun.Properties;
 
                             while (index + 1 < processedRuns.Count)
                             {
@@ -207,7 +265,7 @@ namespace Avalonia.Media.TextFormatting
 
                                 if (shapeableRun.BidiLevel == nextRun.BidiLevel
                                     && TryJoinContiguousMemories(text, nextRun.Text, out var joinedText)
-                                    && CanShapeTogether(shapeableRun.Properties, nextRun.Properties))
+                                    && CanShapeTogether(properties, nextRun.Properties))
                                 {
                                     groupedRuns.Add(nextRun);
                                     index++;
@@ -219,23 +277,29 @@ namespace Avalonia.Media.TextFormatting
                                 break;
                             }
 
-                            var shaperOptions = new TextShaperOptions(currentRun.Properties!.Typeface.GlyphTypeface,
-                                        currentRun.Properties.FontRenderingEmSize,
-                                         shapeableRun.BidiLevel, currentRun.Properties.CultureInfo,
-                                         paragraphProperties.DefaultIncrementalTab, paragraphProperties.LetterSpacing);
+                            var shaperOptions = new TextShaperOptions(
+                                properties.CachedGlyphTypeface,
+                                properties.FontRenderingEmSize, shapeableRun.BidiLevel, properties.CultureInfo,
+                                paragraphProperties.DefaultIncrementalTab, paragraphProperties.LetterSpacing);
 
-                            shapedRuns.AddRange(ShapeTogether(groupedRuns, text, shaperOptions));
+                            ShapeTogether(groupedRuns, text, shaperOptions, textShaper, shapedRuns);
 
                             break;
                         }
-                    default:
+                        default:
                         {
                             shapedRuns.Add(currentRun);
 
                             break;
                         }
+                    }
                 }
             }
+            finally
+            {
+                objectPool.TextRunLists.Return(ref processedRuns);
+                objectPool.UnshapedTextRunLists.Return(ref groupedRuns);
+            }
 
             return shapedRuns;
         }
@@ -303,18 +367,15 @@ namespace Avalonia.Media.TextFormatting
             }
         }
 
-
         private static bool CanShapeTogether(TextRunProperties x, TextRunProperties y)
             => MathUtilities.AreClose(x.FontRenderingEmSize, y.FontRenderingEmSize)
                && x.Typeface == y.Typeface
                && x.BaselineAlignment == y.BaselineAlignment;
 
-        private static IReadOnlyList<ShapedTextRun> ShapeTogether(
-            IReadOnlyList<UnshapedTextRun> textRuns, ReadOnlyMemory<char> text, TextShaperOptions options)
+        private static void ShapeTogether(IReadOnlyList<UnshapedTextRun> textRuns, ReadOnlyMemory<char> text,
+            TextShaperOptions options, TextShaper textShaper, RentedList<TextRun> results)
         {
-            var shapedRuns = new List<ShapedTextRun>(textRuns.Count);
-
-            var shapedBuffer = TextShaper.Current.ShapeText(text, options);
+            var shapedBuffer = textShaper.ShapeText(text, options);
 
             for (var i = 0; i < textRuns.Count; i++)
             {
@@ -322,12 +383,10 @@ namespace Avalonia.Media.TextFormatting
 
                 var splitResult = shapedBuffer.Split(currentRun.Length);
 
-                shapedRuns.Add(new ShapedTextRun(splitResult.First, currentRun.Properties));
+                results.Add(new ShapedTextRun(splitResult.First, currentRun.Properties));
 
                 shapedBuffer = splitResult.Second!;
             }
-
-            return shapedRuns;
         }
 
         /// <summary>
@@ -335,10 +394,11 @@ namespace Avalonia.Media.TextFormatting
         /// </summary>
         /// <param name="textCharacters">The text characters to form <see cref="UnshapedTextRun"/> from.</param>
         /// <param name="levels">The bidi levels.</param>
-        /// <param name="processedRuns"></param>
+        /// <param name="fontManager">The font manager to use.</param>
+        /// <param name="processedRuns">A list that will be filled with the processed runs.</param>
         /// <returns></returns>
-        private static void CoalesceLevels(IReadOnlyList<TextRun> textCharacters, ArraySlice<sbyte> levels,
-            List<TextRun> processedRuns)
+        private static void CoalesceLevels(IReadOnlyList<TextRun> textCharacters, ReadOnlySpan<sbyte> levels,
+            FontManager fontManager, RentedList<TextRun> processedRuns)
         {
             if (levels.Length == 0)
             {
@@ -385,7 +445,8 @@ namespace Avalonia.Media.TextFormatting
 
                     if (j == runTextSpan.Length)
                     {
-                        processedRuns.AddRange(currentRun.GetShapeableCharacters(runText.Slice(0, j), runLevel, ref previousProperties));
+                        currentRun.GetShapeableCharacters(runText.Slice(0, j), runLevel, fontManager,
+                            ref previousProperties, processedRuns);
 
                         runLevel = levels[levelIndex];
 
@@ -398,7 +459,8 @@ namespace Avalonia.Media.TextFormatting
                     }
 
                     // End of this run
-                    processedRuns.AddRange(currentRun.GetShapeableCharacters(runText.Slice(0, j), runLevel, ref previousProperties));
+                    currentRun.GetShapeableCharacters(runText.Slice(0, j), runLevel, fontManager,
+                        ref previousProperties, processedRuns);
 
                     runText = runText.Slice(j);
                     runTextSpan = runText.Span;
@@ -415,7 +477,7 @@ namespace Avalonia.Media.TextFormatting
                 return;
             }
 
-            processedRuns.AddRange(currentRun.GetShapeableCharacters(runText, runLevel, ref previousProperties));
+            currentRun.GetShapeableCharacters(runText, runLevel, fontManager, ref previousProperties, processedRuns);
         }
 
         /// <summary>
@@ -423,19 +485,20 @@ namespace Avalonia.Media.TextFormatting
         /// </summary>
         /// <param name="textSource">The text source.</param>
         /// <param name="firstTextSourceIndex">The first text source index.</param>
-        /// <param name="endOfLine"></param>
-        /// <param name="textSourceLength"></param>
+        /// <param name="objectPool">A pool used to get reusable formatting objects.</param>
+        /// <param name="endOfLine">On return, the end of line, if any.</param>
+        /// <param name="textSourceLength">On return, the processed text source length.</param>
         /// <returns>
         /// The formatted text runs.
         /// </returns>
-        private static List<TextRun> FetchTextRuns(ITextSource textSource, int firstTextSourceIndex,
-            out TextEndOfLine? endOfLine, out int textSourceLength)
+        private static RentedList<TextRun> FetchTextRuns(ITextSource textSource, int firstTextSourceIndex,
+            FormattingObjectPool objectPool, out TextEndOfLine? endOfLine, out int textSourceLength)
         {
             textSourceLength = 0;
 
             endOfLine = null;
 
-            var textRuns = new List<TextRun>();
+            var textRuns = objectPool.TextRunLists.Rent();
 
             var textRunEnumerator = new TextRunEnumerator(textSource, firstTextSourceIndex);
 
@@ -509,15 +572,13 @@ namespace Avalonia.Media.TextFormatting
 
             var lineBreakEnumerator = new LineBreakEnumerator(text.Span);
 
-            while (lineBreakEnumerator.MoveNext())
+            while (lineBreakEnumerator.MoveNext(out lineBreak))
             {
-                if (!lineBreakEnumerator.Current.Required)
+                if (!lineBreak.Required)
                 {
                     continue;
                 }
 
-                lineBreak = lineBreakEnumerator.Current;
-
                 return lineBreak.PositionWrap >= textRun.Length || true;
             }
 
@@ -529,8 +590,10 @@ namespace Avalonia.Media.TextFormatting
             measuredLength = 0;
             var currentWidth = 0.0;
 
-            foreach (var currentRun in textRuns)
+            for (var i = 0; i < textRuns.Count; ++i)
             {
+                var currentRun = textRuns[i];
+
                 switch (currentRun)
                 {
                     case ShapedTextRun shapedTextCharacters:
@@ -540,15 +603,15 @@ namespace Avalonia.Media.TextFormatting
                                 var firstCluster = shapedTextCharacters.ShapedBuffer.GlyphInfos[0].GlyphCluster;
                                 var lastCluster = firstCluster;
 
-                                for (var i = 0; i < shapedTextCharacters.ShapedBuffer.Length; i++)
+                                for (var j = 0; j < shapedTextCharacters.ShapedBuffer.Length; j++)
                                 {
-                                    var glyphInfo = shapedTextCharacters.ShapedBuffer[i];
+                                    var glyphInfo = shapedTextCharacters.ShapedBuffer[j];
 
                                     if (currentWidth + glyphInfo.GlyphAdvance > paragraphWidth)
                                     {
                                         measuredLength += Math.Max(0, lastCluster - firstCluster);
 
-                                        goto found;
+                                        return measuredLength != 0;
                                     }
 
                                     lastCluster = glyphInfo.GlyphCluster;
@@ -565,7 +628,7 @@ namespace Avalonia.Media.TextFormatting
                         {
                             if (currentWidth + drawableTextRun.Size.Width >= paragraphWidth)
                             {
-                                goto found;
+                                return measuredLength != 0;
                             }
 
                             measuredLength += currentRun.Length;
@@ -582,8 +645,6 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
-        found:
-
             return measuredLength != 0;
         }
 
@@ -591,20 +652,23 @@ namespace Avalonia.Media.TextFormatting
         /// Creates an empty text line.
         /// </summary>
         /// <returns>The empty text line.</returns>
-        public static TextLineImpl CreateEmptyTextLine(int firstTextSourceIndex, double paragraphWidth, TextParagraphProperties paragraphProperties)
+        public static TextLineImpl CreateEmptyTextLine(int firstTextSourceIndex, double paragraphWidth,
+            TextParagraphProperties paragraphProperties, FontManager fontManager)
         {
             var flowDirection = paragraphProperties.FlowDirection;
             var properties = paragraphProperties.DefaultTextRunProperties;
-            var glyphTypeface = properties.Typeface.GlyphTypeface;
+            var glyphTypeface = properties.CachedGlyphTypeface;
             var glyph = glyphTypeface.GetGlyph(s_empty[0]);
-            var glyphInfos = new[] { new GlyphInfo(glyph, firstTextSourceIndex) };
+            var glyphInfos = new[] { new GlyphInfo(glyph, firstTextSourceIndex, 0.0) };
 
             var shapedBuffer = new ShapedBuffer(s_empty.AsMemory(), glyphInfos, glyphTypeface, properties.FontRenderingEmSize,
                 (sbyte)flowDirection);
 
-            var textRuns = new List<DrawableTextRun> { new ShapedTextRun(shapedBuffer, properties) };
+            var textRuns = new TextRun[] { new ShapedTextRun(shapedBuffer, properties) };
 
-            return new TextLineImpl(textRuns, firstTextSourceIndex, 0, paragraphWidth, paragraphProperties, flowDirection).FinalizeLine();
+            var line = new TextLineImpl(textRuns, firstTextSourceIndex, 0, paragraphWidth, paragraphProperties, flowDirection);
+            line.FinalizeLine();
+            return line;
         }
 
         /// <summary>
@@ -616,14 +680,16 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="paragraphProperties">The text paragraph properties.</param>
         /// <param name="resolvedFlowDirection"></param>
         /// <param name="currentLineBreak">The current line break if the line was explicitly broken.</param>
+        /// <param name="objectPool">A pool used to get reusable formatting objects.</param>
+        /// <param name="fontManager">The font manager to use.</param>
         /// <returns>The wrapped text line.</returns>
         private static TextLineImpl PerformTextWrapping(IReadOnlyList<TextRun> textRuns, int firstTextSourceIndex,
             double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection resolvedFlowDirection,
-            TextLineBreak? currentLineBreak)
+            TextLineBreak? currentLineBreak, FormattingObjectPool objectPool, FontManager fontManager)
         {
             if (textRuns.Count == 0)
             {
-                return CreateEmptyTextLine(firstTextSourceIndex, paragraphWidth, paragraphProperties);
+                return CreateEmptyTextLine(firstTextSourceIndex, paragraphWidth, paragraphProperties, fontManager);
             }
 
             if (!TryMeasureLength(textRuns, paragraphWidth, out var measuredLength))
@@ -649,20 +715,20 @@ namespace Avalonia.Media.TextFormatting
                     {
                             var lineBreaker = new LineBreakEnumerator(currentRun.Text.Span);
 
-                            while (lineBreaker.MoveNext())
+                            while (lineBreaker.MoveNext(out var lineBreak))
                             {
-                                if (lineBreaker.Current.Required &&
-                                    currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
+                                if (lineBreak.Required &&
+                                    currentLength + lineBreak.PositionMeasure <= measuredLength)
                                 {
                                     //Explicit break found
                                     breakFound = true;
 
-                                    currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+                                    currentPosition = currentLength + lineBreak.PositionWrap;
 
                                     break;
                                 }
 
-                                if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength)
+                                if (currentLength + lineBreak.PositionMeasure > measuredLength)
                                 {
                                     if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
                                     {
@@ -678,21 +744,21 @@ namespace Avalonia.Media.TextFormatting
                                         //Find next possible wrap position (overflow)
                                         if (index < textRuns.Count - 1)
                                         {
-                                            if (lineBreaker.Current.PositionWrap != currentRun.Length)
+                                            if (lineBreak.PositionWrap != currentRun.Length)
                                             {
                                                 //We already found the next possible wrap position.
                                                 breakFound = true;
 
-                                                currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+                                                currentPosition = currentLength + lineBreak.PositionWrap;
 
                                                 break;
                                             }
 
-                                            while (lineBreaker.MoveNext() && index < textRuns.Count)
+                                            while (lineBreaker.MoveNext(out lineBreak) && index < textRuns.Count)
                                             {
-                                                currentPosition += lineBreaker.Current.PositionWrap;
+                                                currentPosition += lineBreak.PositionWrap;
 
-                                                if (lineBreaker.Current.PositionWrap != currentRun.Length)
+                                                if (lineBreak.PositionWrap != currentRun.Length)
                                                 {
                                                     break;
                                                 }
@@ -711,7 +777,7 @@ namespace Avalonia.Media.TextFormatting
                                         }
                                         else
                                         {
-                                            currentPosition = currentLength + lineBreaker.Current.PositionWrap;
+                                            currentPosition = currentLength + lineBreak.PositionWrap;
                                         }
 
                                         breakFound = true;
@@ -727,9 +793,9 @@ namespace Avalonia.Media.TextFormatting
                                     break;
                                 }
 
-                                if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
+                                if (lineBreak.PositionMeasure != lineBreak.PositionWrap)
                                 {
-                                    lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
+                                    lastWrapPosition = currentLength + lineBreak.PositionWrap;
                                 }
                             }
 
@@ -749,24 +815,31 @@ namespace Avalonia.Media.TextFormatting
                 break;
             }
 
-            var splitResult = SplitTextRuns(textRuns, measuredLength);
+            var (preSplitRuns, postSplitRuns) = SplitTextRuns(textRuns, measuredLength, objectPool);
+
+            try
+            {
+                var textLineBreak = postSplitRuns?.Count > 0 ?
+                    new TextLineBreak(null, resolvedFlowDirection, postSplitRuns.ToArray()) :
+                    null;
 
-            var remainingCharacters = splitResult.Second;
+                if (textLineBreak is null && currentLineBreak?.TextEndOfLine != null)
+                {
+                    textLineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, resolvedFlowDirection);
+                }
 
-            var lineBreak = remainingCharacters?.Count > 0 ?
-                new TextLineBreak(null, resolvedFlowDirection, remainingCharacters) :
-                null;
+                var textLine = new TextLineImpl(preSplitRuns.ToArray(), firstTextSourceIndex, measuredLength,
+                    paragraphWidth, paragraphProperties, resolvedFlowDirection,
+                    textLineBreak);
 
-            if (lineBreak is null && currentLineBreak?.TextEndOfLine != null)
+                textLine.FinalizeLine();
+                return textLine;
+            }
+            finally
             {
-                lineBreak = new TextLineBreak(currentLineBreak.TextEndOfLine, resolvedFlowDirection);
+                objectPool.TextRunLists.Return(ref preSplitRuns);
+                objectPool.TextRunLists.Return(ref postSplitRuns);
             }
-
-            var textLine = new TextLineImpl(splitResult.First, firstTextSourceIndex, measuredLength,
-                paragraphWidth, paragraphProperties, resolvedFlowDirection,
-                lineBreak);
-
-            return textLine.FinalizeLine();
         }
 
         private struct TextRunEnumerator
@@ -816,7 +889,7 @@ namespace Avalonia.Media.TextFormatting
         {
             var textShaper = TextShaper.Current;
 
-            var glyphTypeface = textRun.Properties!.Typeface.GlyphTypeface;
+            var glyphTypeface = textRun.Properties!.CachedGlyphTypeface;
 
             var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
 
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
index 468623b356..4923cdbe32 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Avalonia.Utilities;
 
 namespace Avalonia.Media.TextFormatting
@@ -13,6 +12,7 @@ namespace Avalonia.Media.TextFormatting
         private readonly ITextSource _textSource;
         private readonly TextParagraphProperties _paragraphProperties;
         private readonly TextTrimming _textTrimming;
+        private readonly TextLine[] _textLines;
 
         private int _textSourceLength;
 
@@ -69,7 +69,7 @@ namespace Avalonia.Media.TextFormatting
 
             MaxLines = maxLines;
 
-            TextLines = CreateTextLines();
+            _textLines = CreateTextLines();
         }
 
         /// <summary>
@@ -109,7 +109,7 @@ namespace Avalonia.Media.TextFormatting
 
             MaxLines = maxLines;
 
-            TextLines = CreateTextLines();
+            _textLines = CreateTextLines();
         }
 
         /// <summary>
@@ -147,7 +147,8 @@ namespace Avalonia.Media.TextFormatting
         /// <value>
         /// The text lines.
         /// </value>
-        public IReadOnlyList<TextLine> TextLines { get; private set; }
+        public IReadOnlyList<TextLine> TextLines
+            => _textLines;
 
         /// <summary>
         /// Gets the bounds of the layout.
@@ -164,14 +165,14 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="origin">The origin.</param>
         public void Draw(DrawingContext context, Point origin)
         {
-            if (!TextLines.Any())
+            if (_textLines.Length == 0)
             {
                 return;
             }
 
             var (currentX, currentY) = origin;
 
-            foreach (var textLine in TextLines)
+            foreach (var textLine in _textLines)
             {
                 textLine.Draw(context, new Point(currentX + textLine.Start, currentY));
 
@@ -186,7 +187,7 @@ namespace Avalonia.Media.TextFormatting
         /// <returns></returns>
         public Rect HitTestTextPosition(int textPosition)
         {
-            if (TextLines.Count == 0)
+            if (_textLines.Length == 0)
             {
                 return new Rect();
             }
@@ -198,7 +199,7 @@ namespace Avalonia.Media.TextFormatting
 
             var currentY = 0.0;
 
-            foreach (var textLine in TextLines)
+            foreach (var textLine in _textLines)
             {
                 var end = textLine.FirstTextSourceIndex + textLine.Length;
 
@@ -230,11 +231,11 @@ namespace Avalonia.Media.TextFormatting
                 return Array.Empty<Rect>();
             }
 
-            var result = new List<Rect>(TextLines.Count);
+            var result = new List<Rect>(_textLines.Length);
 
             var currentY = 0d;
 
-            foreach (var textLine in TextLines)
+            foreach (var textLine in _textLines)
             {
                 //Current line isn't covered.
                 if (textLine.FirstTextSourceIndex + textLine.Length < start)
@@ -284,13 +285,12 @@ namespace Avalonia.Media.TextFormatting
         {
             var currentY = 0d;
 
-            var lineIndex = 0;
             TextLine? currentLine = null;
             CharacterHit characterHit;
 
-            for (; lineIndex < TextLines.Count; lineIndex++)
+            for (var lineIndex = 0; lineIndex < _textLines.Length; lineIndex++)
             {
-                currentLine = TextLines[lineIndex];
+                currentLine = _textLines[lineIndex];
 
                 if (currentY + currentLine.Height > point.Y)
                 {
@@ -322,12 +322,12 @@ namespace Avalonia.Media.TextFormatting
 
             if (charIndex > _textSourceLength)
             {
-                return TextLines.Count - 1;
+                return _textLines.Length - 1;
             }
 
-            for (var index = 0; index < TextLines.Count; index++)
+            for (var index = 0; index < _textLines.Length; index++)
             {
-                var textLine = TextLines[index];
+                var textLine = _textLines[index];
 
                 if (textLine.FirstTextSourceIndex + textLine.Length < charIndex)
                 {
@@ -341,7 +341,7 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
-            return TextLines.Count - 1;
+            return _textLines.Length - 1;
         }
 
         private TextHitTestResult GetHitTestResult(TextLine textLine, CharacterHit characterHit, Point point)
@@ -424,132 +424,150 @@ namespace Avalonia.Media.TextFormatting
             height += textLine.Height;
         }
 
-        private IReadOnlyList<TextLine> CreateTextLines()
+        private TextLine[] CreateTextLines()
         {
+            var objectPool = FormattingObjectPool.Instance;
+            var fontManager = FontManager.Current;
+
             if (MathUtilities.IsZero(MaxWidth) || MathUtilities.IsZero(MaxHeight))
             {
-                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, double.PositiveInfinity, _paragraphProperties);
+                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, double.PositiveInfinity, _paragraphProperties,
+                    fontManager);
 
                 Bounds = new Rect(0, 0, 0, textLine.Height);
 
-                return new List<TextLine> { textLine };
+                return new TextLine[] { textLine };
             }
 
-            var textLines = new List<TextLine>();
+            var textLines = objectPool.TextLines.Rent();
 
-            double left = double.PositiveInfinity, width = 0.0, height = 0.0;
+            try
+            {
+                double left = double.PositiveInfinity, width = 0.0, height = 0.0;
 
-            _textSourceLength = 0;
+                _textSourceLength = 0;
 
-            TextLine? previousLine = null;
+                TextLine? previousLine = null;
 
-            while (true)
-            {
-                var textLine = TextFormatter.Current.FormatLine(_textSource, _textSourceLength, MaxWidth,
-                    _paragraphProperties, previousLine?.TextLineBreak);
+                var textFormatter = TextFormatter.Current;
 
-                if(textLine == null || textLine.Length == 0)
+                while (true)
                 {
-                    if (previousLine != null && previousLine.NewLineLength > 0)
+                    var textLine = textFormatter.FormatLine(_textSource, _textSourceLength, MaxWidth,
+                        _paragraphProperties, previousLine?.TextLineBreak);
+
+                    if (textLine.Length == 0)
                     {
-                        var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth, _paragraphProperties);
+                        if (previousLine != null && previousLine.NewLineLength > 0)
+                        {
+                            var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth,
+                                _paragraphProperties, fontManager);
 
-                        textLines.Add(emptyTextLine);
+                            textLines.Add(emptyTextLine);
 
-                        UpdateBounds(emptyTextLine, ref left, ref width, ref height);
-                    }
+                            UpdateBounds(emptyTextLine, ref left, ref width, ref height);
+                        }
 
-                    break;
-                }
+                        break;
+                    }
 
-                _textSourceLength += textLine.Length;
+                    _textSourceLength += textLine.Length;
 
-                //Fulfill max height constraint
-                if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight) && height + textLine.Height > MaxHeight)
-                {
-                    if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+                    //Fulfill max height constraint
+                    if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight)
+                        && height + textLine.Height > MaxHeight)
                     {
-                        var collapsedLine =
-                            previousLine.Collapse(GetCollapsingProperties(MaxWidth));
+                        if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+                        {
+                            var collapsedLine =
+                                previousLine.Collapse(GetCollapsingProperties(MaxWidth));
 
-                        textLines[textLines.Count - 1] = collapsedLine;
-                    }
+                            textLines[textLines.Count - 1] = collapsedLine;
+                        }
 
-                    break;
-                }
+                        break;
+                    }
 
-                var hasOverflowed = textLine.HasOverflowed;
+                    var hasOverflowed = textLine.HasOverflowed;
 
-                if (hasOverflowed && _textTrimming != TextTrimming.None)
-                {
-                    textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
-                }
+                    if (hasOverflowed && _textTrimming != TextTrimming.None)
+                    {
+                        textLine = textLine.Collapse(GetCollapsingProperties(MaxWidth));
+                    }
 
-                textLines.Add(textLine);
+                    textLines.Add(textLine);
 
-                UpdateBounds(textLine, ref left, ref width, ref height);
+                    UpdateBounds(textLine, ref left, ref width, ref height);
 
-                previousLine = textLine;
+                    previousLine = textLine;
 
-                //Fulfill max lines constraint
-                if (MaxLines > 0 && textLines.Count >= MaxLines)
-                {
-                    if(textLine.TextLineBreak is TextLineBreak lineBreak && lineBreak.RemainingRuns != null)
+                    //Fulfill max lines constraint
+                    if (MaxLines > 0 && textLines.Count >= MaxLines)
                     {
-                        textLines[textLines.Count - 1] = textLine.Collapse(GetCollapsingProperties(width));
+                        if (textLine.TextLineBreak?.RemainingRuns is not null)
+                        {
+                            textLines[textLines.Count - 1] = textLine.Collapse(GetCollapsingProperties(width));
+                        }
+
+                        break;
                     }
 
-                    break;
+                    if (textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
+                    {
+                        break;
+                    }
                 }
 
-                if (textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
+                //Make sure the TextLayout always contains at least on empty line
+                if (textLines.Count == 0)
                 {
-                    break;
-                }
-            }
-
-            //Make sure the TextLayout always contains at least on empty line
-            if (textLines.Count == 0)
-            {
-                var textLine = TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties);
+                    var textLine =
+                        TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties, fontManager);
 
-                textLines.Add(textLine);
+                    textLines.Add(textLine);
 
-                UpdateBounds(textLine, ref left, ref width, ref height);
-            }
-
-            Bounds = new Rect(left, 0, width, height);
+                    UpdateBounds(textLine, ref left, ref width, ref height);
+                }
 
-            if (_paragraphProperties.TextAlignment == TextAlignment.Justify)
-            {
-                var whitespaceWidth = 0d;
+                Bounds = new Rect(left, 0, width, height);
 
-                foreach (var line in textLines)
+                if (_paragraphProperties.TextAlignment == TextAlignment.Justify)
                 {
-                    var lineWhitespaceWidth = line.Width - line.WidthIncludingTrailingWhitespace;
+                    var whitespaceWidth = 0d;
 
-                    if (lineWhitespaceWidth > whitespaceWidth)
+                    for (var i = 0; i < textLines.Count; i++)
                     {
-                        whitespaceWidth = lineWhitespaceWidth;
-                    }
-                }
+                        var line = textLines[i];
+                        var lineWhitespaceWidth = line.Width - line.WidthIncludingTrailingWhitespace;
 
-                var justificationWidth = width - whitespaceWidth;
+                        if (lineWhitespaceWidth > whitespaceWidth)
+                        {
+                            whitespaceWidth = lineWhitespaceWidth;
+                        }
+                    }
 
-                if (justificationWidth > 0)
-                {
-                    var justificationProperties = new InterWordJustification(justificationWidth);
+                    var justificationWidth = width - whitespaceWidth;
 
-                    for (var i = 0; i < textLines.Count - 1; i++)
+                    if (justificationWidth > 0)
                     {
-                        var line = textLines[i];
+                        var justificationProperties = new InterWordJustification(justificationWidth);
 
-                        line.Justify(justificationProperties);
+                        for (var i = 0; i < textLines.Count - 1; i++)
+                        {
+                            var line = textLines[i];
+
+                            line.Justify(justificationProperties);
+                        }
                     }
                 }
-            }
 
-            return textLines;
+                return textLines.ToArray();
+            }
+            finally
+            {
+                objectPool.TextLines.Return(ref textLines);
+                objectPool.VerifyAllReturned();
+            }
         }
 
         /// <summary>
@@ -569,7 +587,7 @@ namespace Avalonia.Media.TextFormatting
 
         public void Dispose()
         {
-            foreach (var line in TextLines)
+            foreach (var line in _textLines)
             {
                 line.Dispose();
             }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
index e30a0fe9f4..2e85b1e187 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
@@ -1,5 +1,7 @@
-using System;
+// ReSharper disable ForCanBeConvertedToForeach
+using System;
 using System.Collections.Generic;
+using static Avalonia.Media.TextFormatting.FormattingObjectPool;
 
 namespace Avalonia.Media.TextFormatting
 {
@@ -39,11 +41,12 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override TextRun Symbol { get; }
 
-        public override List<TextRun>? Collapse(TextLine textLine)
+        /// <inheritdoc />
+        public override TextRun[]? Collapse(TextLine textLine)
         {
             var textRuns = textLine.TextRuns;
 
-            if (textRuns == null || textRuns.Count == 0)
+            if (textRuns.Count == 0)
             {
                 return null;
             }
@@ -54,7 +57,7 @@ namespace Avalonia.Media.TextFormatting
 
             if (Width < shapedSymbol.GlyphRun.Size.Width)
             {
-                return new List<TextRun>(0);
+                return Array.Empty<TextRun>();
             }
 
             // Overview of ellipsis structure
@@ -75,55 +78,63 @@ namespace Avalonia.Media.TextFormatting
                             {
                                 shapedRun.TryMeasureCharacters(availableWidth, out var measuredLength);
 
-                                var collapsedRuns = new List<TextRun>(textRuns.Count);
-
                                 if (measuredLength > 0)
                                 {
-                                    IReadOnlyList<TextRun>? preSplitRuns = null;
-                                    IReadOnlyList<TextRun>? postSplitRuns;
+                                    var objectPool = FormattingObjectPool.Instance;
 
-                                    if (_prefixLength > 0)
-                                    {
-                                        var splitResult = TextFormatterImpl.SplitTextRuns(textRuns,
-                                            Math.Min(_prefixLength, measuredLength));
+                                    var collapsedRuns = objectPool.TextRunLists.Rent();
 
-                                        collapsedRuns.AddRange(splitResult.First);
+                                    RentedList<TextRun>? rentedPreSplitRuns = null;
+                                    RentedList<TextRun>? rentedPostSplitRuns = null;
 
-                                        preSplitRuns = splitResult.First;
-                                        postSplitRuns = splitResult.Second;
-                                    }
-                                    else
+                                    try
                                     {
-                                        postSplitRuns = textRuns;
-                                    }
+                                        IReadOnlyList<TextRun>? effectivePostSplitRuns;
 
-                                    collapsedRuns.Add(shapedSymbol);
+                                        if (_prefixLength > 0)
+                                        {
+                                            (rentedPreSplitRuns, rentedPostSplitRuns) = TextFormatterImpl.SplitTextRuns(
+                                                textRuns, Math.Min(_prefixLength, measuredLength), objectPool);
 
-                                    if (measuredLength <= _prefixLength || postSplitRuns is null)
-                                    {
-                                        return collapsedRuns;
-                                    }
+                                            effectivePostSplitRuns = rentedPostSplitRuns;
+
+                                            foreach (var preSplitRun in rentedPreSplitRuns)
+                                            {
+                                                collapsedRuns.Add(preSplitRun);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            effectivePostSplitRuns = textRuns;
+                                        }
 
-                                    var availableSuffixWidth = availableWidth;
+                                        collapsedRuns.Add(shapedSymbol);
 
-                                    if (preSplitRuns is not null)
-                                    {
-                                        foreach (var run in preSplitRuns)
+                                        if (measuredLength <= _prefixLength || effectivePostSplitRuns is null)
                                         {
-                                            if (run is DrawableTextRun drawableTextRun)
+                                            return collapsedRuns.ToArray();
+                                        }
+
+                                        var availableSuffixWidth = availableWidth;
+
+                                        if (rentedPreSplitRuns is not null)
+                                        {
+                                            foreach (var run in rentedPreSplitRuns)
                                             {
-                                                availableSuffixWidth -= drawableTextRun.Size.Width;
+                                                if (run is DrawableTextRun drawableTextRun)
+                                                {
+                                                    availableSuffixWidth -= drawableTextRun.Size.Width;
+                                                }
                                             }
                                         }
-                                    }
-
-                                    for (var i = postSplitRuns.Count - 1; i >= 0; i--)
-                                    {
-                                        var run = postSplitRuns[i];
 
-                                        switch (run)
+                                        for (var i = effectivePostSplitRuns.Count - 1; i >= 0; i--)
                                         {
-                                            case ShapedTextRun endShapedRun:
+                                            var run = effectivePostSplitRuns[i];
+
+                                            switch (run)
+                                            {
+                                                case ShapedTextRun endShapedRun:
                                                 {
                                                     if (endShapedRun.TryMeasureCharactersBackwards(availableSuffixWidth,
                                                             out var suffixCount, out var suffixWidth))
@@ -141,15 +152,20 @@ namespace Avalonia.Media.TextFormatting
 
                                                     break;
                                                 }
+                                            }
                                         }
+
+                                        return collapsedRuns.ToArray();
+                                    }
+                                    finally
+                                    {
+                                        objectPool.TextRunLists.Return(ref rentedPreSplitRuns);
+                                        objectPool.TextRunLists.Return(ref rentedPostSplitRuns);
+                                        objectPool.TextRunLists.Return(ref collapsedRuns);
                                     }
-                                }
-                                else
-                                {
-                                    collapsedRuns.Add(shapedSymbol);
                                 }
 
-                                return collapsedRuns;
+                                return new TextRun[] { shapedSymbol };
                             }
 
                             availableWidth -= shapedRun.Size.Width;
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index ab9686a34a..ad3244a3a5 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Avalonia.Utilities;
 
 namespace Avalonia.Media.TextFormatting
 {
-    internal class TextLineImpl : TextLine
+    internal sealed class TextLineImpl : TextLine
     {
-        private IReadOnlyList<TextRun> _textRuns;
+        private readonly TextRun[] _textRuns;
         private readonly double _paragraphWidth;
         private readonly TextParagraphProperties _paragraphProperties;
         private TextLineMetrics _textLineMetrics;
         private readonly FlowDirection _resolvedFlowDirection;
 
-        public TextLineImpl(IReadOnlyList<TextRun> textRuns, int firstTextSourceIndex, int length, double paragraphWidth,
+        public TextLineImpl(TextRun[] textRuns, int firstTextSourceIndex, int length, double paragraphWidth,
             TextParagraphProperties paragraphProperties, FlowDirection resolvedFlowDirection = FlowDirection.LeftToRight,
             TextLineBreak? lineBreak = null, bool hasCollapsed = false)
         {
@@ -147,7 +146,7 @@ namespace Avalonia.Media.TextFormatting
             var collapsedLine = new TextLineImpl(collapsedRuns, FirstTextSourceIndex, Length, _paragraphWidth, _paragraphProperties,
                 _resolvedFlowDirection, TextLineBreak, true);
 
-            if (collapsedRuns.Count > 0)
+            if (collapsedRuns.Length > 0)
             {
                 collapsedLine.FinalizeLine();
             }
@@ -166,7 +165,7 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override CharacterHit GetCharacterHitFromDistance(double distance)
         {
-            if (_textRuns.Count == 0)
+            if (_textRuns.Length == 0)
             {
                 return new CharacterHit();
             }
@@ -182,7 +181,7 @@ namespace Avalonia.Media.TextFormatting
 
             if (distance >= WidthIncludingTrailingWhitespace)
             {
-                var lastRun = _textRuns[_textRuns.Count - 1];
+                var lastRun = _textRuns[_textRuns.Length - 1];
 
                 var size = 0.0;
 
@@ -199,7 +198,7 @@ namespace Avalonia.Media.TextFormatting
             var currentPosition = FirstTextSourceIndex;
             var currentDistance = 0.0;
 
-            for (var i = 0; i < _textRuns.Count; i++)
+            for (var i = 0; i < _textRuns.Length; i++)
             {
                 var currentRun = _textRuns[i];
 
@@ -208,7 +207,7 @@ namespace Avalonia.Media.TextFormatting
                     var rightToLeftIndex = i;
                     currentPosition += currentRun.Length;
 
-                    while (rightToLeftIndex + 1 <= _textRuns.Count - 1)
+                    while (rightToLeftIndex + 1 <= _textRuns.Length - 1)
                     {
                         var nextShaped = _textRuns[++rightToLeftIndex] as ShapedTextRun;
 
@@ -224,7 +223,7 @@ namespace Avalonia.Media.TextFormatting
 
                     for (var j = i; i <= rightToLeftIndex; j++)
                     {
-                        if (j > _textRuns.Count - 1)
+                        if (j > _textRuns.Length - 1)
                         {
                             break;
                         }
@@ -254,7 +253,7 @@ namespace Avalonia.Media.TextFormatting
 
                 if (currentRun is DrawableTextRun drawableTextRun)
                 {
-                    if (i < _textRuns.Count - 1 && currentDistance + drawableTextRun.Size.Width < distance)
+                    if (i < _textRuns.Length - 1 && currentDistance + drawableTextRun.Size.Width < distance)
                     {
                         currentDistance += drawableTextRun.Size.Width;
 
@@ -328,7 +327,7 @@ namespace Avalonia.Media.TextFormatting
 
             if (flowDirection == FlowDirection.LeftToRight)
             {
-                for (var index = 0; index < _textRuns.Count; index++)
+                for (var index = 0; index < _textRuns.Length; index++)
                 {
                     var currentRun = _textRuns[index];
 
@@ -338,7 +337,7 @@ namespace Avalonia.Media.TextFormatting
 
                         var rightToLeftWidth = shapedRun.Size.Width;
 
-                        while (i + 1 <= _textRuns.Count - 1)
+                        while (i + 1 <= _textRuns.Length - 1)
                         {
                             var nextRun = _textRuns[i + 1];
 
@@ -402,7 +401,7 @@ namespace Avalonia.Media.TextFormatting
             {
                 currentDistance += WidthIncludingTrailingWhitespace;
 
-                for (var index = _textRuns.Count - 1; index >= 0; index--)
+                for (var index = _textRuns.Length - 1; index >= 0; index--)
                 {
                     var currentRun = _textRuns[index];
 
@@ -502,7 +501,7 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
         {
-            if (_textRuns.Count == 0)
+            if (_textRuns.Length == 0)
             {
                 return new CharacterHit();
             }
@@ -568,7 +567,7 @@ namespace Avalonia.Media.TextFormatting
         {
             var characterIndex = firstTextSourceIndex + textLength;
 
-            var result = new List<TextBounds>(TextRuns.Count);
+            var result = new List<TextBounds>(_textRuns.Length);
             var lastDirection = FlowDirection.LeftToRight;
             var currentDirection = lastDirection;
 
@@ -581,9 +580,9 @@ namespace Avalonia.Media.TextFormatting
 
             TextRunBounds lastRunBounds = default;
 
-            for (var index = 0; index < TextRuns.Count; index++)
+            for (var index = 0; index < _textRuns.Length; index++)
             {
-                if (TextRuns[index] is not DrawableTextRun currentRun)
+                if (_textRuns[index] is not DrawableTextRun currentRun)
                 {
                     continue;
                 }
@@ -637,7 +636,7 @@ namespace Avalonia.Media.TextFormatting
                         var rightToLeftIndex = index;
                         var rightToLeftWidth = currentShapedRun.Size.Width;
 
-                        while (rightToLeftIndex + 1 <= _textRuns.Count - 1 && _textRuns[rightToLeftIndex + 1] is ShapedTextRun nextShapedRun)
+                        while (rightToLeftIndex + 1 <= _textRuns.Length - 1 && _textRuns[rightToLeftIndex + 1] is ShapedTextRun nextShapedRun)
                         {
                             if (nextShapedRun == null || nextShapedRun.ShapedBuffer.IsLeftToRight)
                             {
@@ -669,12 +668,12 @@ namespace Avalonia.Media.TextFormatting
 
                         for (int i = rightToLeftIndex - 1; i >= index; i--)
                         {
-                            if (TextRuns[i] is not ShapedTextRun)
+                            if (_textRuns[i] is not ShapedTextRun shapedRun)
                             {
                                 continue;
                             }
 
-                            currentShapedRun = (ShapedTextRun)TextRuns[i];
+                            currentShapedRun = shapedRun;
 
                             currentRunBounds = GetRightToLeftTextRunBounds(currentShapedRun, startX, firstTextSourceIndex, characterIndex, currentPosition, remainingLength);
 
@@ -784,7 +783,7 @@ namespace Avalonia.Media.TextFormatting
         {
             var characterIndex = firstTextSourceIndex + textLength;
 
-            var result = new List<TextBounds>(TextRuns.Count);
+            var result = new List<TextBounds>(_textRuns.Length);
             var lastDirection = FlowDirection.LeftToRight;
             var currentDirection = lastDirection;
 
@@ -795,9 +794,9 @@ namespace Avalonia.Media.TextFormatting
             double currentWidth = 0;
             var currentRect = default(Rect);
 
-            for (var index = TextRuns.Count - 1; index >= 0; index--)
+            for (var index = _textRuns.Length - 1; index >= 0; index--)
             {
-                if (TextRuns[index] is not DrawableTextRun currentRun)
+                if (_textRuns[index] is not DrawableTextRun currentRun)
                 {
                     continue;
                 }
@@ -981,7 +980,7 @@ namespace Avalonia.Media.TextFormatting
 
         public override void Dispose()
         {
-            for (int i = 0; i < _textRuns.Count; i++)
+            for (int i = 0; i < _textRuns.Length; i++)
             {
                 if (_textRuns[i] is ShapedTextRun shapedTextRun)
                 {
@@ -990,186 +989,11 @@ namespace Avalonia.Media.TextFormatting
             }
         }
 
-        public TextLineImpl FinalizeLine()
+        public void FinalizeLine()
         {
             _textLineMetrics = CreateLineMetrics();
 
-            BidiReorder();
-
-            return this;
-        }
-
-        private static sbyte GetRunBidiLevel(TextRun run, FlowDirection flowDirection)
-        {
-            if (run is ShapedTextRun shapedTextCharacters)
-            {
-                return shapedTextCharacters.BidiLevel;
-            }
-
-            var defaultLevel = flowDirection == FlowDirection.LeftToRight ? 0 : 1;
-
-            return (sbyte)defaultLevel;
-        }
-
-        private void BidiReorder()
-        {
-            if (_textRuns.Count == 0)
-            {
-                return;
-            }
-
-            // Build up the collection of ordered runs.
-            var run = _textRuns[0];
-
-            OrderedBidiRun orderedRun = new(run, GetRunBidiLevel(run, _resolvedFlowDirection));
-
-            var current = orderedRun;
-
-            for (var i = 1; i < _textRuns.Count; i++)
-            {
-                run = _textRuns[i];
-
-                current.Next = new OrderedBidiRun(run, GetRunBidiLevel(run, _resolvedFlowDirection));
-
-                current = current.Next;
-            }
-
-            // Reorder them into visual order.
-            orderedRun = LinearReOrder(orderedRun);
-
-            // Now perform a recursive reversal of each run.
-            // From the highest level found in the text to the lowest odd level on each line, including intermediate levels
-            // not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-            // https://unicode.org/reports/tr9/#L2
-            sbyte max = 0;
-            var min = sbyte.MaxValue;
-
-            for (var i = 0; i < _textRuns.Count; i++)
-            {
-                var currentRun = _textRuns[i];
-
-                var level = GetRunBidiLevel(currentRun, _resolvedFlowDirection);
-
-                if (level > max)
-                {
-                    max = level;
-                }
-
-                if ((level & 1) != 0 && level < min)
-                {
-                    min = level;
-                }
-            }
-
-            if (min > max)
-            {
-                min = max;
-            }
-
-            if (max == 0 || (min == max && (max & 1) == 0))
-            {
-                // Nothing to reverse.
-                return;
-            }
-
-            // Now apply the reversal and replace the original contents.
-            var minLevelToReverse = max;
-
-            while (minLevelToReverse >= min)
-            {
-                current = orderedRun;
-
-                while (current != null)
-                {
-                    if (current.Level >= minLevelToReverse && current.Level % 2 != 0)
-                    {
-                        if (current.Run is ShapedTextRun { IsReversed: false } shapedTextCharacters)
-                        {
-                            shapedTextCharacters.Reverse();
-                        }
-                    }
-
-                    current = current.Next;
-                }
-
-                minLevelToReverse--;
-            }
-
-            var textRuns = new List<TextRun>(_textRuns.Count);
-
-            current = orderedRun;
-
-            while (current != null)
-            {
-                textRuns.Add(current.Run);
-
-                current = current.Next;
-            }
-
-            _textRuns = textRuns;
-        }
-
-        /// <summary>
-        /// Reorders a series of runs from logical to visual order, returning the left most run.
-        /// <see href="https://github.com/fribidi/linear-reorder/blob/f2f872257d4d8b8e137fcf831f254d6d4db79d3c/linear-reorder.c"/>
-        /// </summary>
-        /// <param name="run">The ordered bidi run.</param>
-        /// <returns>The <see cref="OrderedBidiRun"/>.</returns>
-        private static OrderedBidiRun LinearReOrder(OrderedBidiRun? run)
-        {
-            BidiRange? range = null;
-
-            while (run != null)
-            {
-                var next = run.Next;
-
-                while (range != null && range.Level > run.Level
-                    && range.Previous != null && range.Previous.Level >= run.Level)
-                {
-                    range = BidiRange.MergeWithPrevious(range);
-                }
-
-                if (range != null && range.Level >= run.Level)
-                {
-                    // Attach run to the range.
-                    if ((run.Level & 1) != 0)
-                    {
-                        // Odd, range goes to the right of run.
-                        run.Next = range.Left;
-                        range.Left = run;
-                    }
-                    else
-                    {
-                        // Even, range goes to the left of run.
-                        range.Right!.Next = run;
-                        range.Right = run;
-                    }
-
-                    range.Level = run.Level;
-                }
-                else
-                {
-                    var r = new BidiRange();
-
-                    r.Left = r.Right = run;
-                    r.Level = run.Level;
-                    r.Previous = range;
-
-                    range = r;
-                }
-
-                run = next;
-            }
-
-            while (range?.Previous != null)
-            {
-                range = BidiRange.MergeWithPrevious(range);
-            }
-
-            // Terminate.
-            range!.Right!.Next = null;
-
-            return range.Left!;
+            BidiReorderer.Instance.BidiReorder(_textRuns, _resolvedFlowDirection);
         }
 
         /// <summary>
@@ -1197,7 +1021,7 @@ namespace Avalonia.Media.TextFormatting
 
             var runIndex = GetRunIndexAtCharacterIndex(codepointIndex, LogicalDirection.Forward, out var currentPosition);
 
-            while (runIndex < _textRuns.Count)
+            while (runIndex < _textRuns.Length)
             {
                 var currentRun = _textRuns[runIndex];
 
@@ -1346,7 +1170,7 @@ namespace Avalonia.Media.TextFormatting
             textPosition = FirstTextSourceIndex;
             TextRun? previousRun = null;
 
-            while (runIndex < _textRuns.Count)
+            while (runIndex < _textRuns.Length)
             {
                 var currentRun = _textRuns[runIndex];
 
@@ -1395,7 +1219,7 @@ namespace Avalonia.Media.TextFormatting
                                 }
                             }
 
-                            if (runIndex + 1 >= _textRuns.Count)
+                            if (runIndex + 1 >= _textRuns.Length)
                             {
                                 return runIndex;
                             }
@@ -1411,7 +1235,7 @@ namespace Avalonia.Media.TextFormatting
                                 return runIndex;
                             }
 
-                            if (runIndex + 1 >= _textRuns.Count)
+                            if (runIndex + 1 >= _textRuns.Length)
                             {
                                 return runIndex;
                             }
@@ -1432,7 +1256,7 @@ namespace Avalonia.Media.TextFormatting
 
         private TextLineMetrics CreateLineMetrics()
         {
-            var fontMetrics = _paragraphProperties.DefaultTextRunProperties.Typeface.GlyphTypeface.Metrics;
+            var fontMetrics = _paragraphProperties.DefaultTextRunProperties.CachedGlyphTypeface.Metrics;
             var fontRenderingEmSize = _paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize;
             var scale = fontRenderingEmSize / fontMetrics.DesignEmHeight;
 
@@ -1448,25 +1272,26 @@ namespace Avalonia.Media.TextFormatting
 
             var lineHeight = _paragraphProperties.LineHeight;
 
-            var lastRunIndex = _textRuns.Count - 1;
+            var lastRunIndex = _textRuns.Length - 1;
 
             if (lastRunIndex > 0 && _textRuns[lastRunIndex] is TextEndOfLine)
             {
                 lastRunIndex--;
             }
 
-            for (var index = 0; index < _textRuns.Count; index++)
+            for (var index = 0; index < _textRuns.Length; index++)
             {
                 switch (_textRuns[index])
                 {
                     case ShapedTextRun textRun:
                         {
+                            var properties = textRun.Properties;
                             var textMetrics =
-                                new TextMetrics(textRun.Properties.Typeface.GlyphTypeface, textRun.Properties.FontRenderingEmSize);
+                                new TextMetrics(properties.CachedGlyphTypeface, properties.FontRenderingEmSize);
 
-                            if (fontRenderingEmSize < textRun.Properties.FontRenderingEmSize)
+                            if (fontRenderingEmSize < properties.FontRenderingEmSize)
                             {
-                                fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
+                                fontRenderingEmSize = properties.FontRenderingEmSize;
 
                                 if (ascent > textMetrics.Ascent)
                                 {
@@ -1496,7 +1321,7 @@ namespace Avalonia.Media.TextFormatting
                                 newLineLength = textRun.GlyphRun.Metrics.NewLineLength;
                             }
 
-                            widthIncludingWhitespace += textRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace;
+                            widthIncludingWhitespace += textRun.Size.Width;
 
                             break;
                         }
@@ -1620,59 +1445,5 @@ namespace Avalonia.Media.TextFormatting
                     return 0;
             }
         }
-
-        private sealed class OrderedBidiRun
-        {
-            public OrderedBidiRun(TextRun run, sbyte level)
-            {
-                Run = run;
-                Level = level;
-            }
-
-            public sbyte Level { get; }
-
-            public TextRun Run { get; }
-
-            public OrderedBidiRun? Next { get; set; }
-        }
-
-        private sealed class BidiRange
-        {
-            public int Level { get; set; }
-
-            public OrderedBidiRun? Left { get; set; }
-
-            public OrderedBidiRun? Right { get; set; }
-
-            public BidiRange? Previous { get; set; }
-
-            public static BidiRange MergeWithPrevious(BidiRange range)
-            {
-                var previous = range.Previous;
-
-                BidiRange left;
-                BidiRange right;
-
-                if ((previous!.Level & 1) != 0)
-                {
-                    // Odd, previous goes to the right of range.
-                    left = range;
-                    right = previous;
-                }
-                else
-                {
-                    // Even, previous goes to the left of range.
-                    left = previous;
-                    right = range;
-                }
-
-                // Stitch them
-                left.Right!.Next = right.Left;
-                previous.Left = left.Left;
-                previous.Right = right.Right;
-
-                return previous;
-            }
-        }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
index 86b701cb4b..1622bc3b6d 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextRunProperties.cs
@@ -12,6 +12,8 @@ namespace Avalonia.Media.TextFormatting
     /// </remarks>
     public abstract class TextRunProperties : IEquatable<TextRunProperties>
     {
+        private IGlyphTypeface? _cachedGlyphTypeFace;
+
         /// <summary>
         /// Run typeface
         /// </summary>
@@ -47,6 +49,9 @@ namespace Avalonia.Media.TextFormatting
         /// </summary>
         public virtual BaselineAlignment BaselineAlignment => BaselineAlignment.Baseline;
 
+        internal IGlyphTypeface CachedGlyphTypeface
+            => _cachedGlyphTypeFace ??= Typeface.GlyphTypeface;
+
         public bool Equals(TextRunProperties? other)
         {
             if (ReferenceEquals(null, other))
@@ -93,6 +98,9 @@ namespace Avalonia.Media.TextFormatting
         
         internal TextRunProperties WithTypeface(Typeface typeface)
         {
+            if (this is GenericTextRunProperties other && other.Typeface == typeface)
+                return this;
+
             return new GenericTextRunProperties(typeface, FontRenderingEmSize,
                 TextDecorations, ForegroundBrush, BackgroundBrush, BaselineAlignment);
         }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
index deecbbe476..ccae99cc75 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Avalonia.Media.TextFormatting
+namespace Avalonia.Media.TextFormatting
 {
     /// <summary>
     /// A collapsing properties to collapse whole line toward the end
@@ -26,7 +24,8 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override TextRun Symbol { get; }
 
-        public override List<TextRun>? Collapse(TextLine textLine)
+        /// <inheritdoc />
+        public override TextRun[]? Collapse(TextLine textLine)
         {
             return TextEllipsisHelper.Collapse(textLine, this, false);
         }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs b/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
index c291e1dfb9..c622c76a60 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextTrailingWordEllipsis.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using Avalonia.Utilities;
-
-namespace Avalonia.Media.TextFormatting
+namespace Avalonia.Media.TextFormatting
 {
     /// <summary>
     /// a collapsing properties to collapse whole line toward the end
@@ -31,7 +28,8 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override TextRun Symbol { get; }
 
-        public override List<TextRun>? Collapse(TextLine textLine)
+        /// <inheritdoc />
+        public override TextRun[]? Collapse(TextLine textLine)
         {
             return TextEllipsisHelper.Collapse(textLine, this, true);
         }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
index 100d381afe..3406432ce7 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiAlgorithm.cs
@@ -5,8 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using Avalonia.Collections.Pooled;
 using Avalonia.Utilities;
 
 namespace Avalonia.Media.TextFormatting.Unicode
@@ -28,8 +26,13 @@ namespace Avalonia.Media.TextFormatting.Unicode
     /// as much as possible.
     /// </para>
     /// </remarks>
-    internal struct BidiAlgorithm : IDisposable
+    internal sealed class BidiAlgorithm
     {
+        /// <summary>
+        /// Whether the state is clean and can be reused without a reset.
+        /// </summary>
+        private bool _hasCleanState = true;
+
         /// <summary>
         /// The original BiDiClass classes as provided by the caller
         /// </summary>
@@ -67,7 +70,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// The forward mapping maps the start index to the end index.
         /// The reverse mapping maps the end index to the start index.
         /// </remarks>
-        private BidiDictionary<int, int>? _isolatePairs;
+        private readonly BidiDictionary<int, int> _isolatePairs = new();
 
         /// <summary>
         /// The working BiDi classes
@@ -98,7 +101,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// The status stack used during resolution of explicit
         /// embedding and isolating runs
         /// </summary>
-        private readonly Stack<Status> _statusStack = new Stack<Status>();
+        private readonly Stack<Status> _statusStack = new();
 
         /// <summary>
         /// Mapping used to virtually remove characters for rule X9
@@ -108,7 +111,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <summary>
         /// Re-usable list of level runs
         /// </summary>
-        private readonly List<LevelRun> _levelRuns = new List<LevelRun>();
+        private readonly List<LevelRun> _levelRuns = new();
 
         /// <summary>
         /// Mapping for the current isolating sequence, built
@@ -119,7 +122,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <summary>
         /// A stack of pending isolate openings used by FindIsolatePairs()
         /// </summary>
-        private Stack<int>? _pendingIsolateOpenings;
+        private readonly Stack<int> _pendingIsolateOpenings = new();
 
         /// <summary>
         /// The level of the isolating run currently being processed
@@ -175,12 +178,12 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// Reusable list of pending opening brackets used by the
         /// LocatePairedBrackets method
         /// </summary>
-        private readonly List<int> _pendingOpeningBrackets = new List<int>();
+        private readonly List<int> _pendingOpeningBrackets = new();
 
         /// <summary>
         /// Resolved list of paired brackets
         /// </summary>
-        private readonly List<BracketPair> _pairedBrackets = new List<BracketPair>();
+        private readonly List<BracketPair> _pairedBrackets = new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BidiAlgorithm"/> class.
@@ -228,16 +231,15 @@ namespace Avalonia.Media.TextFormatting.Unicode
             ArraySlice<sbyte>? outLevels)
         {
             // Reset state
-            _isolatePairs?.Clear();
-            _workingClassesBuffer.Clear();
-            _levelRuns.Clear();
-            _resolvedLevelsBuffer.Clear();
+            Reset();
 
             if (types.IsEmpty)
             {
                 return;
             }
 
+            _hasCleanState = false;
+
             // Setup original types and working types
             _originalClasses = types;
             _workingClasses = _workingClassesBuffer.Add(types);
@@ -324,7 +326,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
                         // Skip isolate pairs
                         // (Because we're working with a slice, we need to adjust the indices
                         //  we're using for the isolatePairs map)
-                        if (_isolatePairs?.TryGetValue(data.Start + i, out i) == true)
+                        if (_isolatePairs.TryGetValue(data.Start + i, out i))
                         {
                             i -= data.Start;
                         }
@@ -341,6 +343,17 @@ namespace Avalonia.Media.TextFormatting.Unicode
             return 0;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsIsolateStart(BidiClass type)
+        {
+            const uint mask =
+                (1U << (int)BidiClass.LeftToRightIsolate) |
+                (1U << (int)BidiClass.RightToLeftIsolate) |
+                (1U << (int)BidiClass.FirstStrongIsolate);
+
+            return ((1U << (int)type) & mask) != 0U;
+        }
+
         /// <summary>
         /// Build a list of matching isolates for a directionality slice
         /// Implements BD9
@@ -359,7 +372,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
             _hasIsolates = false;
 
             // BD9...
-            _pendingIsolateOpenings?.Clear();
+            _pendingIsolateOpenings.Clear();
             
             for (var i = 0; i < _originalClasses.Length; i++)
             {
@@ -371,16 +384,14 @@ namespace Avalonia.Media.TextFormatting.Unicode
                     case BidiClass.RightToLeftIsolate:
                     case BidiClass.FirstStrongIsolate:
                     {
-                        _pendingIsolateOpenings ??= new Stack<int>();
                         _pendingIsolateOpenings.Push(i);
                         _hasIsolates = true;
                         break;
                     }
                     case BidiClass.PopDirectionalIsolate:
                     {
-                        if (_pendingIsolateOpenings?.Count > 0)
+                        if (_pendingIsolateOpenings.Count > 0)
                         {
-                            _isolatePairs ??= new BidiDictionary<int, int>();
                             _isolatePairs.Add(_pendingIsolateOpenings.Pop(), i);
                         }
 
@@ -501,7 +512,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
 
                         if (resolvedIsolate == BidiClass.FirstStrongIsolate)
                         {
-                            if (_isolatePairs == null || !_isolatePairs.TryGetValue(i, out var endOfIsolate))
+                            if (!_isolatePairs.TryGetValue(i, out var endOfIsolate))
                             {
                                 endOfIsolate = _originalClasses.Length;
                             }
@@ -701,28 +712,19 @@ namespace Avalonia.Media.TextFormatting.Unicode
             var lastType = _workingClasses[lastCharIndex];
             int nextLevel;
 
-            switch (lastType)
+            if (IsIsolateStart(lastType))
+            {
+                nextLevel = _paragraphEmbeddingLevel;
+            }
+            else
             {
-                case BidiClass.LeftToRightIsolate:
-                case BidiClass.RightToLeftIsolate:
-                case BidiClass.FirstStrongIsolate:
+                i = lastCharIndex + 1;
+                while (i < _originalClasses.Length && IsRemovedByX9(_originalClasses[i]))
                 {
-                    nextLevel = _paragraphEmbeddingLevel;
-                    
-                    break;
+                    i++;
                 }
-                default:
-                {
-                    i = lastCharIndex + 1;
-                    while (i < _originalClasses.Length && IsRemovedByX9(_originalClasses[i]))
-                    {
-                        i++;
-                    }
 
-                    nextLevel = i >= _originalClasses.Length ? _paragraphEmbeddingLevel : _resolvedLevels[i];
-                    
-                    break;
-                }
+                nextLevel = i >= _originalClasses.Length ? _paragraphEmbeddingLevel : _resolvedLevels[i];
             }
 
             var eos = DirectionFromLevel(Math.Max(nextLevel, level));
@@ -831,8 +833,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
                     // PDI and concatenate that run to this one
                     var lastCharacterIndex = _isolatedRunMapping[_isolatedRunMapping.Length - 1];
                     var lastType = _originalClasses[lastCharacterIndex];
-                    if ((lastType == BidiClass.LeftToRightIsolate || lastType == BidiClass.RightToLeftIsolate || lastType == BidiClass.FirstStrongIsolate) &&
-                            _isolatePairs?.TryGetValue(lastCharacterIndex, out var nextRunIndex) == true)
+                    if (IsIsolateStart(lastType) && _isolatePairs.TryGetValue(lastCharacterIndex, out var nextRunIndex))
                     {
                         // Find the continuing run index
                         runIndex = FindRunForIndex(nextRunIndex);
@@ -855,87 +856,73 @@ namespace Avalonia.Media.TextFormatting.Unicode
         private void ProcessIsolatedRunSequence(BidiClass sos, BidiClass eos, int runLevel)
         {
             // Create mappings onto the underlying data
-            _runResolvedClasses = new MappedArraySlice<BidiClass>(_workingClasses, _isolatedRunMapping.AsSlice());
-            _runOriginalClasses = new MappedArraySlice<BidiClass>(_originalClasses, _isolatedRunMapping.AsSlice());
-            _runLevels = new MappedArraySlice<sbyte>(_resolvedLevels, _isolatedRunMapping.AsSlice());
+            var isolatedRunMapping = _isolatedRunMapping.AsSlice();
+            _runResolvedClasses = new MappedArraySlice<BidiClass>(_workingClasses, isolatedRunMapping);
+            _runOriginalClasses = new MappedArraySlice<BidiClass>(_originalClasses, isolatedRunMapping);
+            _runLevels = new MappedArraySlice<sbyte>(_resolvedLevels, isolatedRunMapping);
             if (_hasBrackets)
             {
-                _runBiDiPairedBracketTypes = new MappedArraySlice<BidiPairedBracketType>(_pairedBracketTypes, _isolatedRunMapping.AsSlice());
-                _runPairedBracketValues = new MappedArraySlice<int>(_pairedBracketValues, _isolatedRunMapping.AsSlice());
+                _runBiDiPairedBracketTypes = new MappedArraySlice<BidiPairedBracketType>(_pairedBracketTypes, isolatedRunMapping);
+                _runPairedBracketValues = new MappedArraySlice<int>(_pairedBracketValues, isolatedRunMapping);
             }
 
             _runLevel = runLevel;
             _runDirection = DirectionFromLevel(runLevel);
             _runLength = _runResolvedClasses.Length;
 
-            // By tracking the types of characters known to be in the current run, we can
-            // skip some of the rules that we know won't apply.  The flags will be
-            // initialized while we're processing rule W1 below.
-            var hasEN = false;
-            var hasAL = false;
-            var hasES = false;
-            var hasCS = false;
-            var hasAN = false;
-            var hasET = false;
-
             // Rule W1
             // Also, set hasXX flags
             int i;
             var previousClass = sos;
             
+            const uint isolateMask =
+                (1U << (int)BidiClass.LeftToRightIsolate) |
+                (1U << (int)BidiClass.RightToLeftIsolate) |
+                (1U << (int)BidiClass.FirstStrongIsolate) |
+                (1U << (int)BidiClass.PopDirectionalIsolate);
+
+            const uint wRulesMask =
+                (1U << (int)BidiClass.EuropeanNumber) |
+                (1U << (int)BidiClass.ArabicLetter) |
+                (1U << (int)BidiClass.EuropeanSeparator) |
+                (1U << (int)BidiClass.CommonSeparator) |
+                (1U << (int)BidiClass.ArabicNumber) |
+                (1U << (int)BidiClass.EuropeanTerminator);
+
+            uint wRules = 0;
+
             for (i = 0; i < _runLength; i++)
             {
                 var resolvedClass = _runResolvedClasses[i];
-                
-                switch (resolvedClass)
-                {
-                    case BidiClass.NonspacingMark:
-                        _runResolvedClasses[i] = previousClass;
-                        break;
 
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
+                if (resolvedClass == BidiClass.NonspacingMark)
+                {
+                    _runResolvedClasses[i] = previousClass;
+                }
+                else
+                {
+                    var classBit = 1U << (int)resolvedClass;
+                    if ((classBit & isolateMask) != 0U)
+                    {
                         previousClass = BidiClass.OtherNeutral;
-                        break;
-
-                    case BidiClass.EuropeanNumber:
-                        hasEN = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.ArabicLetter:
-                        hasAL = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.EuropeanSeparator:
-                        hasES = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.CommonSeparator:
-                        hasCS = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.ArabicNumber:
-                        hasAN = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    case BidiClass.EuropeanTerminator:
-                        hasET = true;
-                        previousClass = resolvedClass;
-                        break;
-
-                    default:
+                    }
+                    else
+                    {
+                        wRules |= classBit & wRulesMask;
                         previousClass = resolvedClass;
-                        break;
+                    }
                 }
             }
 
+            // By tracking the types of characters known to be in the current run, we can
+            // skip some of the rules that we know won't apply.
+            var hasEN = (wRules & (1U << (int)BidiClass.EuropeanNumber)) != 0U;
+            var hasAL = (wRules & (1U << (int)BidiClass.ArabicLetter)) != 0U;
+            var hasES = (wRules & (1U << (int)BidiClass.EuropeanSeparator)) != 0U;
+            var hasCS = (wRules & (1U << (int)BidiClass.CommonSeparator)) != 0U;
+            var hasAN = (wRules & (1U << (int)BidiClass.ArabicNumber)) != 0U;
+            var hasET = (wRules & (1U << (int)BidiClass.EuropeanTerminator)) != 0U;
+
             // Rule W2
             if (hasEN)
             {
@@ -1547,23 +1534,20 @@ namespace Avalonia.Media.TextFormatting.Unicode
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static bool IsWhitespace(BidiClass biDiClass)
         {
-            switch (biDiClass)
-            {
-                    case BidiClass.LeftToRightEmbedding:
-                    case BidiClass.RightToLeftEmbedding:
-                    case BidiClass.LeftToRightOverride:
-                    case BidiClass.RightToLeftOverride:
-                    case BidiClass.PopDirectionalFormat:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                    case BidiClass.BoundaryNeutral:
-                    case BidiClass.WhiteSpace:
-                        return true;
-                default:
-                    return false;
-            }
+            const uint mask =
+                (1U << (int)BidiClass.LeftToRightEmbedding) |
+                (1U << (int)BidiClass.RightToLeftEmbedding) |
+                (1U << (int)BidiClass.LeftToRightOverride) |
+                (1U << (int)BidiClass.RightToLeftOverride) |
+                (1U << (int)BidiClass.PopDirectionalFormat) |
+                (1U << (int)BidiClass.LeftToRightIsolate) |
+                (1U << (int)BidiClass.RightToLeftIsolate) |
+                (1U << (int)BidiClass.FirstStrongIsolate) |
+                (1U << (int)BidiClass.PopDirectionalIsolate) |
+                (1U << (int)BidiClass.BoundaryNeutral) |
+                (1U << (int)BidiClass.WhiteSpace);
+
+            return ((1U << (int)biDiClass) & mask) != 0U;
         }
 
         /// <summary>
@@ -1584,18 +1568,15 @@ namespace Avalonia.Media.TextFormatting.Unicode
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static bool IsRemovedByX9(BidiClass biDiClass)
         {
-            switch (biDiClass)
-            {
-                    case BidiClass.LeftToRightEmbedding:
-                    case  BidiClass.RightToLeftEmbedding:
-                    case  BidiClass.LeftToRightOverride:
-                    case  BidiClass.RightToLeftOverride:
-                    case  BidiClass.PopDirectionalFormat:
-                    case  BidiClass.BoundaryNeutral:
-                        return true;
-                default:
-                    return false;
-            }
+            const uint mask =
+                (1U << (int)BidiClass.LeftToRightEmbedding) |
+                (1U << (int)BidiClass.RightToLeftEmbedding) |
+                (1U << (int)BidiClass.LeftToRightOverride) |
+                (1U << (int)BidiClass.RightToLeftOverride) |
+                (1U << (int)BidiClass.PopDirectionalFormat) |
+                (1U << (int)BidiClass.BoundaryNeutral);
+
+            return ((1U << (int)biDiClass) & mask) != 0U;
         }
 
         /// <summary>
@@ -1604,20 +1585,17 @@ namespace Avalonia.Media.TextFormatting.Unicode
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static bool IsNeutralClass(BidiClass direction)
         {
-            switch (direction)
-            {
-                    case BidiClass.ParagraphSeparator:
-                    case BidiClass.SegmentSeparator:
-                    case BidiClass.WhiteSpace:
-                    case BidiClass.OtherNeutral:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                        return true;
-                        default:
-                            return false;
-            }
+            const uint mask =
+                (1U << (int)BidiClass.ParagraphSeparator) |
+                (1U << (int)BidiClass.SegmentSeparator) |
+                (1U << (int)BidiClass.WhiteSpace) |
+                (1U << (int)BidiClass.OtherNeutral) |
+                (1U << (int)BidiClass.RightToLeftIsolate) |
+                (1U << (int)BidiClass.LeftToRightIsolate) |
+                (1U << (int)BidiClass.FirstStrongIsolate) |
+                (1U << (int)BidiClass.PopDirectionalIsolate);
+
+            return ((1U << (int)direction) & mask) != 0U;
         }
 
         /// <summary>
@@ -1642,6 +1620,47 @@ namespace Avalonia.Media.TextFormatting.Unicode
             }
         }
 
+        /// <summary>
+        /// Resets the bidi algorithm to a clean state.
+        /// </summary>
+        public void Reset()
+        {
+            if (_hasCleanState)
+            {
+                return;
+            }
+
+            _originalClasses = default;
+            _pairedBracketTypes = default;
+            _pairedBracketValues = default;
+            _hasBrackets = default;
+            _hasEmbeddings = default;
+            _hasIsolates = default;
+            _isolatePairs.ClearThenResetIfTooLarge();
+            _workingClasses = default;
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _workingClassesBuffer);
+            _resolvedLevels = default;
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _resolvedLevelsBuffer);
+            _paragraphEmbeddingLevel = default;
+            FormattingBufferHelper.ClearThenResetIfTooLarge(_statusStack);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _x9Map);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(_levelRuns);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _isolatedRunMapping);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(_pendingIsolateOpenings);
+            _runLevel = default;
+            _runDirection = default;
+            _runLength = default;
+            _runResolvedClasses = default;
+            _runOriginalClasses = default;
+            _runLevels = default;
+            _runBiDiPairedBracketTypes = default;
+            _runPairedBracketValues = default;
+            FormattingBufferHelper.ClearThenResetIfTooLarge(_pendingOpeningBrackets);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(_pairedBrackets);
+
+            _hasCleanState = true;
+        }
+
         /// <summary>
         /// Hold the start and end index of a pair of brackets
         /// </summary>
@@ -1717,13 +1736,5 @@ namespace Avalonia.Media.TextFormatting.Unicode
 
             public BidiClass Eos { get; }
         }
-
-        public void Dispose()
-        {
-            _workingClassesBuffer.Dispose();
-            _resolvedLevelsBuffer.Dispose();
-            _x9Map.Dispose();
-            _isolatedRunMapping.Dispose();
-        }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
index 0f0b3235e1..b8094056f2 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/BiDiData.cs
@@ -11,8 +11,10 @@ namespace Avalonia.Media.TextFormatting.Unicode
     /// Represents a unicode string and all associated attributes
     /// for each character required for the bidirectional Unicode algorithm
     /// </summary>
-    internal struct BidiData : IDisposable
+    /// <remarks>To avoid allocations, this class is designed to be reused.</remarks>
+    internal sealed class BidiData
     {
+        private bool _hasCleanState = true;
         private ArrayBuilder<BidiClass> _classes;
         private ArrayBuilder<BidiPairedBracketType> _pairedBracketTypes;
         private ArrayBuilder<int> _pairedBracketValues;
@@ -20,12 +22,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         private ArrayBuilder<BidiPairedBracketType> _savedPairedBracketTypes;
         private ArrayBuilder<sbyte> _tempLevelBuffer;
 
-        public BidiData(sbyte paragraphEmbeddingLevel)
-        {
-            ParagraphEmbeddingLevel = paragraphEmbeddingLevel;
-        }
-
-        public sbyte ParagraphEmbeddingLevel { get; private set; }
+        public sbyte ParagraphEmbeddingLevel { get; set; }
 
         public bool HasBrackets { get; private set; }
 
@@ -36,7 +33,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <summary>
         /// Gets the length of the data held by the BidiData
         /// </summary>
-        public int Length{get; private set; }
+        public int Length { get; private set; }
 
         /// <summary>
         /// Gets the bidi character type of each code point
@@ -66,6 +63,8 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <param name="text">The text to process.</param>
         public void Append(ReadOnlySpan<char> text)
         {
+            _hasCleanState = false;
+
             _classes.Add(text.Length);
             _pairedBracketTypes.Add(text.Length);
             _pairedBracketValues.Add(text.Length);
@@ -74,39 +73,32 @@ namespace Avalonia.Media.TextFormatting.Unicode
             // bracket values for all code points
 
             int i = Length;
+
+            const uint embeddingMask =
+                (1U << (int)BidiClass.LeftToRightEmbedding) |
+                (1U << (int)BidiClass.LeftToRightOverride) |
+                (1U << (int)BidiClass.RightToLeftEmbedding) |
+                (1U << (int)BidiClass.RightToLeftOverride) |
+                (1U << (int)BidiClass.PopDirectionalFormat);
+
+            const uint isolateMask =
+                (1U << (int)BidiClass.LeftToRightIsolate) |
+                (1U << (int)BidiClass.RightToLeftIsolate) |
+                (1U << (int)BidiClass.FirstStrongIsolate) |
+                (1U << (int)BidiClass.PopDirectionalIsolate);
              
             var codePointEnumerator = new CodepointEnumerator(text);
             
-            while (codePointEnumerator.MoveNext())
+            while (codePointEnumerator.MoveNext(out var codepoint))
             {
-                var codepoint = codePointEnumerator.Current;
-
                 // Look up BiDiClass
                 var dir = codepoint.BiDiClass;
                 
                 _classes[i] = dir;
 
-                switch (dir)
-                {
-                    case BidiClass.LeftToRightEmbedding:
-                    case BidiClass.LeftToRightOverride:
-                    case BidiClass.RightToLeftEmbedding:
-                    case BidiClass.RightToLeftOverride:
-                    case BidiClass.PopDirectionalFormat:
-                    {
-                        HasEmbeddings = true;
-                        break;
-                    }
-
-                    case BidiClass.LeftToRightIsolate:
-                    case BidiClass.RightToLeftIsolate:
-                    case BidiClass.FirstStrongIsolate:
-                    case BidiClass.PopDirectionalIsolate:
-                    {
-                        HasIsolates = true;
-                        break;
-                    }
-                }
+                var dirBit = 1U << (int)dir;
+                HasEmbeddings = (dirBit & embeddingMask) != 0U;
+                HasIsolates = (dirBit & isolateMask) != 0U;
 
                 // Lookup paired bracket types
                 var pbt = codepoint.PairedBracketType;
@@ -151,6 +143,8 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// </remarks>
         public void SaveTypes()
         {
+            _hasCleanState = false;
+
             // Capture the types data
             _savedClasses.Clear();
             _savedClasses.Add(_classes.AsSlice());
@@ -163,6 +157,8 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// </summary>
         public void RestoreTypes()
         {
+            _hasCleanState = false;
+
             _classes.Clear();
             _classes.Add(_savedClasses.AsSlice());
             _pairedBracketTypes.Clear();
@@ -182,14 +178,34 @@ namespace Avalonia.Media.TextFormatting.Unicode
             return _tempLevelBuffer.Add(length, false);
         }
 
-        public void Dispose()
+        /// <summary>
+        /// Resets the bidi data to a clean state.
+        /// </summary>
+        public void Reset()
         {
-            _classes.Dispose();
-            _pairedBracketTypes.Dispose();
-            _pairedBracketValues.Dispose();
-            _savedClasses.Dispose();
-            _savedPairedBracketTypes.Dispose();
-            _tempLevelBuffer.Dispose();
+            if (_hasCleanState)
+            {
+                return;
+            }
+
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _classes);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _pairedBracketTypes);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _pairedBracketValues);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _savedClasses);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _savedPairedBracketTypes);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _tempLevelBuffer);
+
+            ParagraphEmbeddingLevel = 0;
+            HasBrackets = false;
+            HasEmbeddings = false;
+            HasIsolates = false;
+            Length = 0;
+
+            Classes = default;
+            PairedBracketTypes = default;
+            PairedBracketValues = default;
+
+            _hasCleanState = true;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
index 22f7b50fd4..23a1e4a275 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
 namespace Avalonia.Media.TextFormatting.Unicode
@@ -11,13 +10,19 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <summary>
         /// The replacement codepoint that is used for non supported values.
         /// </summary>
-        public static readonly Codepoint ReplacementCodepoint = new Codepoint('\uFFFD');
-
-        public Codepoint(uint value)
+        public static Codepoint ReplacementCodepoint
         {
-            _value = value;
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => new('\uFFFD');
         }
 
+        /// <summary>
+        /// Creates a new instance of <see cref="Codepoint"/> with the specified value.
+        /// </summary>
+        /// <param name="value">The codepoint value.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Codepoint(uint value) => _value = value;
+
         /// <summary>
         /// Get the codepoint's value.
         /// </summary>
@@ -87,19 +92,17 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// </returns>
         public bool IsWhiteSpace
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
-                switch (GeneralCategory)
-                {
-                    case GeneralCategory.Control:
-                    case GeneralCategory.NonspacingMark:
-                    case GeneralCategory.Format:
-                    case GeneralCategory.SpaceSeparator:
-                    case GeneralCategory.SpacingMark:
-                        return true;
-                }
-
-                return false;
+                const ulong whiteSpaceMask =
+                    (1UL << (int)GeneralCategory.Control) |
+                    (1UL << (int)GeneralCategory.NonspacingMark) |
+                    (1UL << (int)GeneralCategory.Format) |
+                    (1UL << (int)GeneralCategory.SpaceSeparator) |
+                    (1UL << (int)GeneralCategory.SpacingMark);
+
+                return ((1UL << (int)GeneralCategory) & whiteSpaceMask) != 0UL;
             }
         }
         
@@ -166,56 +169,62 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <param name="index">The index to read at.</param>
         /// <param name="count">The count of character that were read.</param>
         /// <returns></returns>
+#if NET6_0_OR_GREATER
+        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+#else
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static Codepoint ReadAt(ReadOnlySpan<char> text, int index, out int count)
         {
+            // Perf note: this method is performance critical for text layout, modify with care!
+
             count = 1;
 
-            if (index >= text.Length)
+            // Perf note: uint check allows the JIT to ellide the next bound check
+            if ((uint)index >= (uint)text.Length)
             {
                 return ReplacementCodepoint;
             }
 
-            var code = text[index];
-
-            ushort hi, low;
+            uint code = text[index];
 
-            //# High surrogate
-            if (0xD800 <= code && code <= 0xDBFF)
+            //# Surrogate
+            if (IsInRangeInclusive(code, 0xD800U, 0xDFFFU))
             {
-                hi = code;
-
-                if (index + 1 == text.Length)
-                {
-                    return ReplacementCodepoint;
-                }
-
-                low = text[index + 1];
-
-                if (0xDC00 <= low && low <= 0xDFFF)
-                {
-                    count = 2;
-                    return new Codepoint((uint)((hi - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000));
-                }
-
-                return ReplacementCodepoint;
-            }
+                uint hi, low;
 
-            //# Low surrogate
-            if (0xDC00 <= code && code <= 0xDFFF)
-            {
-                if (index == 0)
+                //# High surrogate
+                if (code <= 0xDBFF)
                 {
-                    return ReplacementCodepoint;
+                    if ((uint)(index + 1) < (uint)text.Length)
+                    {
+                        hi = code;
+                        low = text[index + 1];
+
+                        if (IsInRangeInclusive(low, 0xDC00U, 0xDFFFU))
+                        {
+                            count = 2;
+                            // Perf note: the code is written as below to become just two instructions: shl, lea.
+                            // See https://github.com/dotnet/runtime/blob/7ec3634ee579d89b6024f72b595bfd7118093fc5/src/libraries/System.Private.CoreLib/src/System/Text/UnicodeUtility.cs#L38
+                            return new Codepoint((hi << 10) + low - ((0xD800U << 10) + 0xDC00U - (1 << 16)));
+                        }
+                    }
                 }
 
-                hi = text[index - 1];
-
-                low = code;
-
-                if (0xD800 <= hi && hi <= 0xDBFF)
+                //# Low surrogate
+                else
                 {
-                    count = 2;
-                    return new Codepoint((uint)((hi - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000));
+                    if (index > 0)
+                    {
+                        low = code;
+                        hi = text[index - 1];
+
+                        if (IsInRangeInclusive(hi, 0xD800U, 0xDBFFU))
+                        {
+                            count = 2;
+                            return new Codepoint((hi << 10) + low - ((0xD800U << 10) + 0xDC00U - (1 << 16)));
+                        }
+                    }
                 }
 
                 return ReplacementCodepoint;
@@ -224,12 +233,16 @@ namespace Avalonia.Media.TextFormatting.Unicode
             return new Codepoint(code);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsInRangeInclusive(uint value, uint lowerBound, uint upperBound)
+            => value - lowerBound <= upperBound - lowerBound;
+
         /// <summary>
         /// Returns <see langword="true"/> if <paramref name="cp"/> is between
         /// <paramref name="lowerBound"/> and <paramref name="upperBound"/>, inclusive.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsInRangeInclusive(Codepoint cp, uint lowerBound, uint upperBound)
-            => (cp._value - lowerBound) <= (upperBound - lowerBound);
+            => IsInRangeInclusive(cp._value, lowerBound, upperBound);
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
index d21f30ab7e..47a2b7d46a 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
@@ -4,35 +4,27 @@ namespace Avalonia.Media.TextFormatting.Unicode
 {
     public ref struct CodepointEnumerator
     {
-        private ReadOnlySpan<char> _text;
+        private readonly ReadOnlySpan<char> _text;
+        private int _offset;
 
         public CodepointEnumerator(ReadOnlySpan<char> text)
-        {
-            _text = text;
-            Current = Codepoint.ReplacementCodepoint;
-        }
-
-        /// <summary>
-        /// Gets the current <see cref="Codepoint"/>.
-        /// </summary>
-        public Codepoint Current { get; private set; }
+            => _text = text;
 
         /// <summary>
         /// Moves to the next <see cref="Codepoint"/>.
         /// </summary>
         /// <returns></returns>
-        public bool MoveNext()
+        public bool MoveNext(out Codepoint codepoint)
         {
-            if (_text.IsEmpty)
+            if ((uint)_offset >= (uint)_text.Length)
             {
-                Current = Codepoint.ReplacementCodepoint;
-
+                codepoint = Codepoint.ReplacementCodepoint;
                 return false;
             }
 
-            Current = Codepoint.ReadAt(_text, 0, out var count);
+            codepoint = Codepoint.ReadAt(_text, _offset, out var count);
 
-            _text = _text.Slice(count);
+            _offset += count;
 
             return true;
         }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
index fa8e8ac976..fcc12d3526 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/Grapheme.cs
@@ -1,16 +1,15 @@
-using System;
-
-namespace Avalonia.Media.TextFormatting.Unicode
+namespace Avalonia.Media.TextFormatting.Unicode
 {
     /// <summary>
     /// Represents the smallest unit of a writing system of any given language.
     /// </summary>
     public readonly ref struct Grapheme
     {
-        public Grapheme(Codepoint firstCodepoint, ReadOnlySpan<char> text)
+        public Grapheme(Codepoint firstCodepoint, int offset, int length)
         {
             FirstCodepoint = firstCodepoint;
-            Text = text;
+            Offset = offset;
+            Length = length;
         }
 
         /// <summary>
@@ -19,8 +18,13 @@ namespace Avalonia.Media.TextFormatting.Unicode
         public Codepoint FirstCodepoint { get; }
 
         /// <summary>
-        /// The text of the grapheme cluster
+        /// Gets the starting code unit offset of this grapheme inside its containing text.
+        /// </summary>
+        public int Offset { get; }
+
+        /// <summary>
+        /// Gets the length of this grapheme, in code units.
         /// </summary>
-        public ReadOnlySpan<char> Text { get; }
+        public int Length { get; }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
index 812bb99d99..dd01662155 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
@@ -4,57 +4,79 @@
 // Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace Avalonia.Media.TextFormatting.Unicode
 {
     public ref struct GraphemeEnumerator
     {
-        private ReadOnlySpan<char> _text;
+        private readonly ReadOnlySpan<char> _text;
+        private int _currentCodeUnitOffset;
+        private int _codeUnitLengthOfCurrentCodepoint;
+        private Codepoint _currentCodepoint;
+
+        /// <summary>
+        /// Will be <see cref="GraphemeBreakClass.Other"/> if invalid data or EOF reached.
+        /// Caller shouldn't need to special-case this since the normal rules will halt on this condition.
+        /// </summary>
+        private GraphemeBreakClass _currentType;
 
         public GraphemeEnumerator(ReadOnlySpan<char> text)
         {
             _text = text;
-            Current = default;
+            _currentCodeUnitOffset = 0;
+            _codeUnitLengthOfCurrentCodepoint = 0;
+            _currentCodepoint = Codepoint.ReplacementCodepoint;
+            _currentType = GraphemeBreakClass.Other;
         }
 
-        /// <summary>
-        /// Gets the current <see cref="Grapheme"/>.
-        /// </summary>
-        public Grapheme Current { get; private set; }
-
         /// <summary>
         /// Moves to the next <see cref="Grapheme"/>.
         /// </summary>
         /// <returns></returns>
-        public bool MoveNext()
+        public bool MoveNext(out Grapheme grapheme)
         {
-            if (_text.IsEmpty)
+            var startOffset = _currentCodeUnitOffset;
+
+            if ((uint)startOffset >= (uint)_text.Length)
             {
+                grapheme = default;
                 return false;
             }
 
             // Algorithm given at https://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundary_Rules.
 
-            var processor = new Processor(_text);
-
-            processor.MoveNext();
+            if (startOffset == 0)
+            {
+                ReadNextCodepoint();
+            }
 
-            var firstCodepoint = processor.CurrentCodepoint;
+            var firstCodepoint = _currentCodepoint;
 
             // First, consume as many Prepend scalars as we can (rule GB9b).
-            while (processor.CurrentType == GraphemeBreakClass.Prepend)
+            if (_currentType == GraphemeBreakClass.Prepend)
             {
-                processor.MoveNext();
+                do
+                {
+                    ReadNextCodepoint();
+                } while (_currentType == GraphemeBreakClass.Prepend);
+
+                // There were only Prepend scalars in the text
+                if ((uint)_currentCodeUnitOffset >= (uint)_text.Length)
+                {
+                    goto Return;
+                }
             }
 
             // Next, make sure we're not about to violate control character restrictions.
             // Essentially, if we saw Prepend data, we can't have Control | CR | LF data afterward (rule GB5).
-            if (processor.CurrentCodeUnitOffset > 0)
+            if (_currentCodeUnitOffset > startOffset)
             {
-                if (processor.CurrentType == GraphemeBreakClass.Control
-                    || processor.CurrentType == GraphemeBreakClass.CR
-                    || processor.CurrentType == GraphemeBreakClass.LF)
+                const uint controlCrLfMask =
+                    (1U << (int)GraphemeBreakClass.Control) |
+                    (1U << (int)GraphemeBreakClass.CR) |
+                    (1U << (int)GraphemeBreakClass.LF);
+
+                if (((1U << (int)_currentType) & controlCrLfMask) != 0U)
                 {
                     goto Return;
                 }
@@ -62,19 +84,19 @@ namespace Avalonia.Media.TextFormatting.Unicode
 
             // Now begin the main state machine.
 
-            var previousClusterBreakType = processor.CurrentType;
+            var previousClusterBreakType = _currentType;
 
-            processor.MoveNext();
+            ReadNextCodepoint();
 
             switch (previousClusterBreakType)
             {
                 case GraphemeBreakClass.CR:
-                    if (processor.CurrentType != GraphemeBreakClass.LF)
+                    if (_currentType != GraphemeBreakClass.LF)
                     {
                         goto Return; // rules GB3 & GB4 (only <LF> can follow <CR>)
                     }
 
-                    processor.MoveNext();
+                    ReadNextCodepoint();
                     goto case GraphemeBreakClass.LF;
 
                 case GraphemeBreakClass.Control:
@@ -82,53 +104,57 @@ namespace Avalonia.Media.TextFormatting.Unicode
                     goto Return; // rule GB4 (no data after Control | LF)
 
                 case GraphemeBreakClass.L:
-                    if (processor.CurrentType == GraphemeBreakClass.L)
+                {
+                    if (_currentType == GraphemeBreakClass.L)
                     {
-                        processor.MoveNext(); // rule GB6 (L x L)
+                        ReadNextCodepoint(); // rule GB6 (L x L)
                         goto case GraphemeBreakClass.L;
                     }
-                    else if (processor.CurrentType == GraphemeBreakClass.V)
+                    else if (_currentType == GraphemeBreakClass.V)
                     {
-                        processor.MoveNext(); // rule GB6 (L x V)
+                        ReadNextCodepoint(); // rule GB6 (L x V)
                         goto case GraphemeBreakClass.V;
                     }
-                    else if (processor.CurrentType == GraphemeBreakClass.LV)
+                    else if (_currentType == GraphemeBreakClass.LV)
                     {
-                        processor.MoveNext(); // rule GB6 (L x LV)
+                        ReadNextCodepoint(); // rule GB6 (L x LV)
                         goto case GraphemeBreakClass.LV;
                     }
-                    else if (processor.CurrentType == GraphemeBreakClass.LVT)
+                    else if (_currentType == GraphemeBreakClass.LVT)
                     {
-                        processor.MoveNext(); // rule GB6 (L x LVT)
+                        ReadNextCodepoint(); // rule GB6 (L x LVT)
                         goto case GraphemeBreakClass.LVT;
                     }
                     else
                     {
                         break;
                     }
+                }
 
                 case GraphemeBreakClass.LV:
                 case GraphemeBreakClass.V:
-                    if (processor.CurrentType == GraphemeBreakClass.V)
+                {
+                    if (_currentType == GraphemeBreakClass.V)
                     {
-                        processor.MoveNext(); // rule GB7 (LV | V x V)
+                        ReadNextCodepoint(); // rule GB7 (LV | V x V)
                         goto case GraphemeBreakClass.V;
                     }
-                    else if (processor.CurrentType == GraphemeBreakClass.T)
+                    else if (_currentType == GraphemeBreakClass.T)
                     {
-                        processor.MoveNext(); // rule GB7 (LV | V x T)
+                        ReadNextCodepoint(); // rule GB7 (LV | V x T)
                         goto case GraphemeBreakClass.T;
                     }
                     else
                     {
                         break;
                     }
+                }
 
                 case GraphemeBreakClass.LVT:
                 case GraphemeBreakClass.T:
-                    if (processor.CurrentType == GraphemeBreakClass.T)
+                    if (_currentType == GraphemeBreakClass.T)
                     {
-                        processor.MoveNext(); // rule GB8 (LVT | T x T)
+                        ReadNextCodepoint(); // rule GB8 (LVT | T x T)
                         goto case GraphemeBreakClass.T;
                     }
                     else
@@ -139,123 +165,79 @@ namespace Avalonia.Media.TextFormatting.Unicode
                 case GraphemeBreakClass.ExtendedPictographic:
                     // Attempt processing extended pictographic (rules GB11, GB9).
                     // First, drain any Extend scalars that might exist
-                    while (processor.CurrentType == GraphemeBreakClass.Extend)
+                    while (_currentType == GraphemeBreakClass.Extend)
                     {
-                        processor.MoveNext();
+                        ReadNextCodepoint();
                     }
 
                     // Now see if there's a ZWJ + extended pictograph again.
-                    if (processor.CurrentType != GraphemeBreakClass.ZWJ)
+                    if (_currentType != GraphemeBreakClass.ZWJ)
                     {
                         break;
                     }
 
-                    processor.MoveNext();
-                    if (processor.CurrentType != GraphemeBreakClass.ExtendedPictographic)
+                    ReadNextCodepoint();
+                    if (_currentType != GraphemeBreakClass.ExtendedPictographic)
                     {
                         break;
                     }
 
-                    processor.MoveNext();
+                    ReadNextCodepoint();
                     goto case GraphemeBreakClass.ExtendedPictographic;
 
                 case GraphemeBreakClass.RegionalIndicator:
                     // We've consumed a single RI scalar. Try to consume another (to make it a pair).
 
-                    if (processor.CurrentType == GraphemeBreakClass.RegionalIndicator)
+                    if (_currentType == GraphemeBreakClass.RegionalIndicator)
                     {
-                        processor.MoveNext();
+                        ReadNextCodepoint();
                     }
 
                     // Standlone RI scalars (or a single pair of RI scalars) can only be followed by trailers.
 
                     break; // nothing but trailers after the final RI
-
-                default:
-                    break;
             }
 
+            const uint gb9Mask =
+                (1U << (int)GraphemeBreakClass.Extend) |
+                (1U << (int)GraphemeBreakClass.ZWJ) |
+                (1U << (int)GraphemeBreakClass.SpacingMark);
+
             // rules GB9, GB9a
-            while (processor.CurrentType == GraphemeBreakClass.Extend
-                || processor.CurrentType == GraphemeBreakClass.ZWJ
-                || processor.CurrentType == GraphemeBreakClass.SpacingMark)
+            while (((1U << (int)_currentType) & gb9Mask) != 0U)
             {
-                processor.MoveNext();
+                ReadNextCodepoint();
             }
 
             Return:
 
-            Current = new Grapheme(firstCodepoint, _text.Slice(0, processor.CurrentCodeUnitOffset));
-
-            _text = _text.Slice(processor.CurrentCodeUnitOffset);
+            var graphemeLength = _currentCodeUnitOffset - startOffset;
+            grapheme = new Grapheme(firstCodepoint, startOffset, graphemeLength);
 
             return true; // rules GB2, GB999
         }
 
-        [StructLayout(LayoutKind.Auto)]
-        private ref struct Processor
+        private void ReadNextCodepoint()
         {
-            private readonly ReadOnlySpan<char> _buffer;
-            private int _codeUnitLengthOfCurrentScalar;
-
-            internal Processor(ReadOnlySpan<char> buffer)
-            {
-                _buffer = buffer;
-                _codeUnitLengthOfCurrentScalar = 0;
-                CurrentCodepoint = Codepoint.ReplacementCodepoint;
-                CurrentType = GraphemeBreakClass.Other;
-                CurrentCodeUnitOffset = 0;
-            }
-
-            public int CurrentCodeUnitOffset { get; private set; }
-
-            /// <summary>
-            /// Will be <see cref="GraphemeBreakClass.Other"/> if invalid data or EOF reached.
-            /// Caller shouldn't need to special-case this since the normal rules will halt on this condition.
-            /// </summary>
-            public GraphemeBreakClass CurrentType { get; private set; }
-
-            /// <summary>
-            ///     Get the currently processed <see cref="Codepoint"/>.
-            /// </summary>
-            public Codepoint CurrentCodepoint { get; private set; }
-
-            public void MoveNext()
-            {
-                // For ill-formed subsequences (like unpaired UTF-16 surrogate code points), we rely on
-                // the decoder's default behavior of interpreting these ill-formed subsequences as
-                // equivalent to U+FFFD REPLACEMENT CHARACTER. This code point has a boundary property
-                // of Other (XX), which matches the modifications made to UAX#29, Rev. 35.
-                // See: https://www.unicode.org/reports/tr29/tr29-35.html#Modifications
-                // This change is also reflected in the UCD files. For example, Unicode 11.0's UCD file
-                // https://www.unicode.org/Public/11.0.0/ucd/auxiliary/GraphemeBreakProperty.txt
-                // has the line "D800..DFFF    ; Control # Cs [2048] <surrogate-D800>..<surrogate-DFFF>",
-                // but starting with Unicode 12.0 that line has been removed.
-                //
-                // If a later version of the Unicode Standard further modifies this guidance we should reflect
-                // that here.
-
-                if (CurrentCodeUnitOffset == _buffer.Length)
-                {
-                    CurrentCodepoint = Codepoint.ReplacementCodepoint;
-                }
-                else
-                {
-                    CurrentCodeUnitOffset += _codeUnitLengthOfCurrentScalar;
-
-                    if (CurrentCodeUnitOffset < _buffer.Length)
-                    {
-                        CurrentCodepoint = Codepoint.ReadAt(_buffer, CurrentCodeUnitOffset,
-                            out _codeUnitLengthOfCurrentScalar);
-                    }
-                    else
-                    {
-                        CurrentCodepoint = Codepoint.ReplacementCodepoint;
-                    }
-                }
-
-                CurrentType = CurrentCodepoint.GraphemeBreakClass;
-            }
+            // For ill-formed subsequences (like unpaired UTF-16 surrogate code points), we rely on
+            // the decoder's default behavior of interpreting these ill-formed subsequences as
+            // equivalent to U+FFFD REPLACEMENT CHARACTER. This code point has a boundary property
+            // of Other (XX), which matches the modifications made to UAX#29, Rev. 35.
+            // See: https://www.unicode.org/reports/tr29/tr29-35.html#Modifications
+            // This change is also reflected in the UCD files. For example, Unicode 11.0's UCD file
+            // https://www.unicode.org/Public/11.0.0/ucd/auxiliary/GraphemeBreakProperty.txt
+            // has the line "D800..DFFF    ; Control # Cs [2048] <surrogate-D800>..<surrogate-DFFF>",
+            // but starting with Unicode 12.0 that line has been removed.
+            //
+            // If a later version of the Unicode Standard further modifies this guidance we should reflect
+            // that here.
+
+            _currentCodeUnitOffset += _codeUnitLengthOfCurrentCodepoint;
+
+            _currentCodepoint = Codepoint.ReadAt(_text, _currentCodeUnitOffset,
+                out _codeUnitLengthOfCurrentCodepoint);
+
+            _currentType = _currentCodepoint.GraphemeBreakClass;
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
index 877ab76ce5..5e12b7458e 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -3,6 +3,7 @@
 // Ported from: https://github.com/SixLabors/Fonts/
 
 using System;
+using System.Runtime.CompilerServices;
 
 namespace Avalonia.Media.TextFormatting.Unicode
 {
@@ -46,10 +47,8 @@ namespace Avalonia.Media.TextFormatting.Unicode
             _lb30 = false;
             _lb30a = 0;
         }
-        
-        public LineBreak Current { get; private set; }
-        
-        public bool MoveNext()
+
+        public bool MoveNext(out LineBreak lineBreak)
         {
             // Get the first char if we're at the beginning of the string.
             if (_first)
@@ -75,7 +74,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
                     case LineBreakClass.CarriageReturn when _nextClass != LineBreakClass.LineFeed:
                     {
                         _currentClass = MapFirst(_nextClass);
-                        Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, true);
+                        lineBreak = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, true);
                         return true;
                     }
                 }
@@ -87,7 +86,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
 
                 if (shouldBreak)
                 {
-                    Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
+                    lineBreak = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
                     return true;
                 }
             }
@@ -108,23 +107,23 @@ namespace Avalonia.Media.TextFormatting.Unicode
                             break;
                     }
 
-                    Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, required);
+                    lineBreak = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition, required);
                     return true;
                 }
             }
 
-            Current = default;
-            
+            lineBreak = default;
             return false;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static LineBreakClass MapClass(Codepoint cp)
         {
             if (cp.Value == 327685)
             {
                 return LineBreakClass.Alphabetic;
             }
-            
+
             // LB 1
             // ==========================================
             // Resolved Original    General_Category
@@ -133,26 +132,38 @@ namespace Avalonia.Media.TextFormatting.Unicode
             // CM       SA          Only Mn or Mc
             // AL       SA          Any except Mn and Mc
             // NS       CJ          Any
-            switch (cp.LineBreakClass)
-            {
-                case LineBreakClass.Ambiguous:
-                case LineBreakClass.Surrogate:
-                case LineBreakClass.Unknown:
-                    return LineBreakClass.Alphabetic;
-
-                case LineBreakClass.ComplexContext:
-                    return cp.GeneralCategory == GeneralCategory.NonspacingMark || cp.GeneralCategory == GeneralCategory.SpacingMark
-                        ? LineBreakClass.CombiningMark
-                        : LineBreakClass.Alphabetic;
+            var cls = cp.LineBreakClass;
 
-                case LineBreakClass.ConditionalJapaneseStarter:
-                    return LineBreakClass.Nonstarter;
+            const ulong specialMask =
+                (1UL << (int)LineBreakClass.Ambiguous) |
+                (1UL << (int)LineBreakClass.Surrogate) |
+                (1UL << (int)LineBreakClass.Unknown) |
+                (1UL << (int)LineBreakClass.ComplexContext) |
+                (1UL << (int)LineBreakClass.ConditionalJapaneseStarter);
 
-                default:
-                    return cp.LineBreakClass;
+            if (((1UL << (int)cls) & specialMask) != 0UL)
+            {
+                switch (cls)
+                {
+                    case LineBreakClass.Ambiguous:
+                    case LineBreakClass.Surrogate:
+                    case LineBreakClass.Unknown:
+                        return LineBreakClass.Alphabetic;
+
+                    case LineBreakClass.ComplexContext:
+                        return cp.GeneralCategory is GeneralCategory.NonspacingMark or GeneralCategory.SpacingMark
+                            ? LineBreakClass.CombiningMark
+                            : LineBreakClass.Alphabetic;
+
+                    case LineBreakClass.ConditionalJapaneseStarter:
+                        return LineBreakClass.Nonstarter;
+                }
             }
+
+            return cls;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static LineBreakClass MapFirst(LineBreakClass c)
         {
             switch (c)
@@ -169,10 +180,80 @@ namespace Avalonia.Media.TextFormatting.Unicode
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static bool IsAlphaNumeric(LineBreakClass cls)
-            => cls == LineBreakClass.Alphabetic
-            || cls == LineBreakClass.HebrewLetter
-            || cls == LineBreakClass.Numeric;
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.Alphabetic) |
+                (1UL << (int)LineBreakClass.HebrewLetter) |
+                (1UL << (int)LineBreakClass.Numeric);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsPrefixPostfixNumericOrSpace(LineBreakClass cls)
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.PostfixNumeric) |
+                (1UL << (int)LineBreakClass.PrefixNumeric) |
+                (1UL << (int)LineBreakClass.Space);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsPrefixPostfixNumeric(LineBreakClass cls)
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.PostfixNumeric) |
+                (1UL << (int)LineBreakClass.PrefixNumeric);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsClosePunctuationOrParenthesis(LineBreakClass cls)
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.ClosePunctuation) |
+                (1UL << (int)LineBreakClass.CloseParenthesis);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsClosePunctuationOrInfixNumericOrBreakSymbols(LineBreakClass cls)
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.ClosePunctuation) |
+                (1UL << (int)LineBreakClass.InfixNumeric) |
+                (1UL << (int)LineBreakClass.BreakSymbols);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsSpaceOrWordJoinerOrAlphabetic(LineBreakClass cls)
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.Space) |
+                (1UL << (int)LineBreakClass.WordJoiner) |
+                (1UL << (int)LineBreakClass.Alphabetic);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static bool IsMandatoryBreakOrLineFeedOrCarriageReturn(LineBreakClass cls)
+        {
+            const ulong mask =
+                (1UL << (int)LineBreakClass.MandatoryBreak) |
+                (1UL << (int)LineBreakClass.LineFeed) |
+                (1UL << (int)LineBreakClass.CarriageReturn);
+
+            return ((1UL << (int)cls) & mask) != 0UL;
+        }
 
         private LineBreakClass PeekNextCharClass()
         {
@@ -198,83 +279,77 @@ namespace Avalonia.Media.TextFormatting.Unicode
             // Track combining mark exceptions. LB22
             if (cls == LineBreakClass.CombiningMark)
             {
-                switch (_currentClass)
+                const ulong lb22ExMask =
+                    (1UL << (int)LineBreakClass.MandatoryBreak) |
+                    (1UL << (int)LineBreakClass.ContingentBreak) |
+                    (1UL << (int)LineBreakClass.Exclamation) |
+                    (1UL << (int)LineBreakClass.LineFeed) |
+                    (1UL << (int)LineBreakClass.NextLine) |
+                    (1UL << (int)LineBreakClass.Space) |
+                    (1UL << (int)LineBreakClass.ZWSpace) |
+                    (1UL << (int)LineBreakClass.CarriageReturn);
+
+                if (((1UL << (int)_currentClass) & lb22ExMask) != 0UL)
                 {
-                    case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.ContingentBreak:
-                    case LineBreakClass.Exclamation:
-                    case LineBreakClass.LineFeed:
-                    case LineBreakClass.NextLine:
-                    case LineBreakClass.Space:
-                    case LineBreakClass.ZWSpace:
-                    case LineBreakClass.CarriageReturn:
-                        _lb22ex = true;
-                        break;
+                    _lb22ex = true;
                 }
-            }
 
-            // Track combining mark exceptions. LB31
-            if (_first && cls == LineBreakClass.CombiningMark)
-            {
-                _lb31 = true;
+                const ulong lb31Mask =
+                    (1UL << (int)LineBreakClass.MandatoryBreak) |
+                    (1UL << (int)LineBreakClass.ContingentBreak) |
+                    (1UL << (int)LineBreakClass.Exclamation) |
+                    (1UL << (int)LineBreakClass.LineFeed) |
+                    (1UL << (int)LineBreakClass.NextLine) |
+                    (1UL << (int)LineBreakClass.Space) |
+                    (1UL << (int)LineBreakClass.ZWSpace) |
+                    (1UL << (int)LineBreakClass.CarriageReturn) |
+                    (1UL << (int)LineBreakClass.ZWJ);
+
+                // Track combining mark exceptions. LB31
+                if (_first || ((1UL << (int)_currentClass) & lb31Mask) != 0UL)
+                {
+                    _lb31 = true;
+                }
             }
 
-            if (cls == LineBreakClass.CombiningMark)
+            if (_first)
             {
-                switch (_currentClass)
+                // Rule LB24
+                if (IsClosePunctuationOrParenthesis(cls))
                 {
-                    case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.ContingentBreak:
-                    case LineBreakClass.Exclamation:
-                    case LineBreakClass.LineFeed:
-                    case LineBreakClass.NextLine:
-                    case LineBreakClass.Space:
-                    case LineBreakClass.ZWSpace:
-                    case LineBreakClass.CarriageReturn:
-                    case LineBreakClass.ZWJ:
-                        _lb31 = true;
-                        break;
+                    _lb24ex = true;
                 }
-            }
 
-            if (_first
-                && (cls == LineBreakClass.PostfixNumeric || cls == LineBreakClass.PrefixNumeric || cls == LineBreakClass.Space))
-            {
-                _lb31 = true;
+                // Rule LB25
+                if (IsClosePunctuationOrInfixNumericOrBreakSymbols(cls))
+                {
+                    _lb25ex = true;
+                }
+
+                if (IsPrefixPostfixNumericOrSpace(cls))
+                {
+                    _lb31 = true;
+                }
             }
 
-            if (_currentClass == LineBreakClass.Alphabetic && 
-                (cls == LineBreakClass.PostfixNumeric || cls == LineBreakClass.PrefixNumeric || cls == LineBreakClass.Space))
+            if (_currentClass == LineBreakClass.Alphabetic && IsPrefixPostfixNumericOrSpace(cls))
             {
                 _lb31 = true;
             }
 
             // Reset LB31 if next is U+0028 (Left Opening Parenthesis)
             if (_lb31
-                && _currentClass != LineBreakClass.PostfixNumeric
-                && _currentClass != LineBreakClass.PrefixNumeric
-                && cls == LineBreakClass.OpenPunctuation && cp.Value == 0x0028)
+                && !IsPrefixPostfixNumeric(_currentClass)
+                && cls == LineBreakClass.OpenPunctuation
+                && cp.Value == 0x0028)
             {
                 _lb31 = false;
             }
 
-            // Rule LB24
-            if (_first && (cls == LineBreakClass.ClosePunctuation || cls == LineBreakClass.CloseParenthesis))
-            {
-                _lb24ex = true;
-            }
-
-            // Rule LB25
-            if (_first
-                && (cls == LineBreakClass.ClosePunctuation || cls == LineBreakClass.InfixNumeric || cls == LineBreakClass.BreakSymbols))
-            {
-                _lb25ex = true;
-            }
-
-            if (cls == LineBreakClass.Space || cls == LineBreakClass.WordJoiner || cls == LineBreakClass.Alphabetic)
+            if (IsSpaceOrWordJoinerOrAlphabetic(cls))
             {
                 var next = PeekNextCharClass();
-                if (next == LineBreakClass.ClosePunctuation || next == LineBreakClass.InfixNumeric || next == LineBreakClass.BreakSymbols)
+                if (IsClosePunctuationOrInfixNumericOrBreakSymbols(next))
                 {
                     _lb25ex = true;
                 }
@@ -295,6 +370,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
             return cls;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private bool? GetSimpleBreak()
         {
             // handle classes not handled by the pair table
@@ -317,6 +393,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
             return null;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)] // quite long but only one usage
         private bool GetPairTableBreak(LineBreakClass lastClass)
         {
             // If not handled already, use the pair table
@@ -477,8 +554,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
 
                 var cls = cp.LineBreakClass;
 
-                if (cls == LineBreakClass.MandatoryBreak || cls == LineBreakClass.LineFeed ||
-                    cls == LineBreakClass.CarriageReturn)
+                if (IsMandatoryBreakOrLineFeedOrCarriageReturn(cls))
                 {
                     from -= count;
                 }
diff --git a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
index 6aa5eeea3d..c05c04c22e 100644
--- a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
@@ -91,7 +91,7 @@ namespace Avalonia.Platform
         /// </summary>
         /// <param name="foreground">The foreground.</param>
         /// <param name="glyphRun">The glyph run.</param>
-        void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun);
+        void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun);
 
         /// <summary>
         /// Creates a new <see cref="IRenderTargetBitmapImpl"/> that can be used as a render layer
diff --git a/src/Avalonia.Base/Platform/IExternalObjectsRenderInterfaceContextFeature.cs b/src/Avalonia.Base/Platform/IExternalObjectsRenderInterfaceContextFeature.cs
new file mode 100644
index 0000000000..5b06651b5f
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IExternalObjectsRenderInterfaceContextFeature.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Metadata;
+using Avalonia.Rendering.Composition;
+
+namespace Avalonia.Platform;
+
+[Unstable]
+public interface IExternalObjectsRenderInterfaceContextFeature
+{
+    /// <summary>
+    /// Returns the list of image handle types supported by the current GPU backend, see <see cref="KnownPlatformGraphicsExternalImageHandleTypes"/>
+    /// </summary>
+    IReadOnlyList<string> SupportedImageHandleTypes { get; }
+    
+    /// <summary>
+    /// Returns the list of semaphore types supported by the current GPU backend, see <see cref="KnownPlatformGraphicsExternalSemaphoreHandleTypes"/>
+    /// </summary>
+    IReadOnlyList<string> SupportedSemaphoreTypes { get; }
+
+    IPlatformRenderInterfaceImportedImage ImportImage(IPlatformHandle handle,
+        PlatformGraphicsExternalImageProperties properties);
+
+    IPlatformRenderInterfaceImportedImage ImportImage(ICompositionImportableSharedGpuContextImage image);
+
+    IPlatformRenderInterfaceImportedSemaphore ImportSemaphore(IPlatformHandle handle);
+    CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType);
+    public byte[]? DeviceUuid { get; }
+    public byte[]? DeviceLuid { get; }
+}
+
+[Unstable]
+public interface IPlatformRenderInterfaceImportedObject : IDisposable
+{
+    
+}
+
+[Unstable]
+public interface IPlatformRenderInterfaceImportedImage : IPlatformRenderInterfaceImportedObject
+{
+    IBitmapImpl SnapshotWithKeyedMutex(uint acquireIndex, uint releaseIndex);
+
+    IBitmapImpl SnapshotWithSemaphores(IPlatformRenderInterfaceImportedSemaphore waitForSemaphore,
+        IPlatformRenderInterfaceImportedSemaphore signalSemaphore);
+
+    IBitmapImpl SnapshotWithAutomaticSync();
+}
+
+[Unstable]
+public interface IPlatformRenderInterfaceImportedSemaphore : IPlatformRenderInterfaceImportedObject
+{
+    
+}
diff --git a/src/Avalonia.Base/Platform/IGlyphRunImpl.cs b/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
index 6a8ae4d954..46b065b04e 100644
--- a/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
+++ b/src/Avalonia.Base/Platform/IGlyphRunImpl.cs
@@ -10,6 +10,23 @@ namespace Avalonia.Platform
     [Unstable]
     public interface IGlyphRunImpl : IDisposable 
     {
-        IReadOnlyList<float> GetIntersections(float lowerBound, float upperBound);
+
+        /// <summary>
+        ///     Gets the conservative bounding box of the glyph run./>.
+        /// </summary>
+        Size Size { get; }
+
+        /// <summary>
+        ///     Gets the baseline origin of the glyph run./>.
+        /// </summary>
+        Point BaselineOrigin { get; }
+
+        /// <summary>
+        /// Gets the intersections of specified upper and lower limit.
+        /// </summary>
+        /// <param name="lowerLimit">Upper limit.</param>
+        /// <param name="upperLimit">Lower limit.</param>
+        /// <returns></returns>
+        IReadOnlyList<float> GetIntersections(float lowerLimit, float upperLimit);
     }
 }
diff --git a/src/Avalonia.Base/Platform/IOptionalFeatureProvider.cs b/src/Avalonia.Base/Platform/IOptionalFeatureProvider.cs
index b6464dea58..66d4f083c2 100644
--- a/src/Avalonia.Base/Platform/IOptionalFeatureProvider.cs
+++ b/src/Avalonia.Base/Platform/IOptionalFeatureProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Avalonia.Platform;
 
@@ -15,4 +16,12 @@ public static class OptionalFeatureProviderExtensions
 {
     public static T? TryGetFeature<T>(this IOptionalFeatureProvider provider) where T : class =>
         (T?)provider.TryGetFeature(typeof(T));
-}
\ No newline at end of file
+
+    public static bool TryGetFeature<T>(this IOptionalFeatureProvider provider, [MaybeNullWhen(false)] out T rv)
+        where T : class
+    {
+        rv = provider.TryGetFeature<T>();
+        return rv != null;
+    }
+        
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
index 1828f24aff..41e792d58e 100644
--- a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
 
 namespace Avalonia.Platform
@@ -166,11 +167,10 @@ namespace Avalonia.Platform
         /// </summary>
         /// <param name="glyphTypeface">The glyph typeface.</param>
         /// <param name="fontRenderingEmSize">The font rendering em size.</param>
-        /// <param name="glyphIndices">The glyph indices.</param>
-        /// <param name="glyphAdvances">The glyph advances.</param>
-        /// <param name="glyphOffsets">The glyph offsets.</param>
-        /// <returns></returns>
-        IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double>? glyphAdvances, IReadOnlyList<Vector>? glyphOffsets);
+        /// <param name="glyphInfos">The list of glyphs.</param>
+        /// <param name="baselineOrigin">The baseline origin of the run. Can be null.</param>
+        /// <returns>An <see cref="IGlyphRunImpl"/>.</returns>
+        IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<GlyphInfo> glyphInfos, Point baselineOrigin);
 
         /// <summary>
         /// Creates a backend-specific object using a low-level API graphics context
@@ -210,5 +210,10 @@ namespace Avalonia.Platform
         /// </param>
         /// <returns>An <see cref="IRenderTarget"/>.</returns>
         IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces);
+        
+        /// <summary>
+        /// Indicates that the context is no longer usable. This method should be thread-safe
+        /// </summary>
+        bool IsLost { get; }
     }
 }
diff --git a/src/Avalonia.Base/Platform/PlatformGraphicsExternalMemory.cs b/src/Avalonia.Base/Platform/PlatformGraphicsExternalMemory.cs
new file mode 100644
index 0000000000..cad4ab2051
--- /dev/null
+++ b/src/Avalonia.Base/Platform/PlatformGraphicsExternalMemory.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Avalonia.Platform;
+
+public struct PlatformGraphicsExternalImageProperties
+{
+    public int Width { get; set; }
+    public int Height { get; set; }
+    public PlatformGraphicsExternalImageFormat Format { get; set; }
+    public ulong MemorySize { get; set; }
+    public ulong MemoryOffset { get; set; }
+    public bool TopLeftOrigin { get; set; }
+}
+
+public enum PlatformGraphicsExternalImageFormat
+{
+    R8G8B8A8UNorm,
+    B8G8R8A8UNorm
+}
+
+/// <summary>
+/// Describes various GPU memory handle types that are currently supported by Avalonia graphics backends
+/// </summary>
+public static class KnownPlatformGraphicsExternalImageHandleTypes
+{
+    /// <summary>
+    /// An DXGI global shared handle returned by IDXGIResource::GetSharedHandle D3D11_RESOURCE_MISC_SHARED or D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX flag.
+    /// The handle does not own the reference to the underlying video memory, so the provider should make sure that the resource is valid until
+    /// the handle has been successfully imported
+    /// </summary>
+    public const string D3D11TextureGlobalSharedHandle = nameof(D3D11TextureGlobalSharedHandle);
+    /// <summary>
+    /// A DXGI NT handle returned by IDXGIResource1::CreateSharedHandle for a texture created with D3D11_RESOURCE_MISC_SHARED_NTHANDLE or flag
+    /// </summary>
+    public const string D3D11TextureNtHandle = nameof(D3D11TextureNtHandle);
+    /// <summary>
+    /// A POSIX file descriptor that's exported by Vulkan using VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT or in a compatible way
+    /// </summary>
+    public const string VulkanOpaquePosixFileDescriptor = nameof(VulkanOpaquePosixFileDescriptor);
+}
+
+/// <summary>
+/// Describes various GPU semaphore handle types that are currently supported by Avalonia graphics backends
+/// </summary>
+public static class KnownPlatformGraphicsExternalSemaphoreHandleTypes
+{
+    /// <summary>
+    /// A POSIX file descriptor that's been exported by Vulkan using VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT or in a compatible way
+    /// </summary>
+    public const string VulkanOpaquePosixFileDescriptor = nameof(VulkanOpaquePosixFileDescriptor);
+    
+    /// <summary>
+    /// A NT handle that's been exported by Vulkan using VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT or in a compatible way
+    /// </summary>
+    public const string VulkanOpaqueNtHandle = nameof(VulkanOpaqueNtHandle);
+    
+    // A global shared handle that's been exported by Vulkan using VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT or in a compatible way
+    public const string VulkanOpaqueKmtHandle = nameof(VulkanOpaqueKmtHandle);
+    
+    /// A DXGI NT handle returned by ID3D12Device::CreateSharedHandle or ID3D11Fence::CreateSharedHandle
+    public const string Direct3D12FenceNtHandle = nameof(Direct3D12FenceNtHandle);
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
index cec20678cf..a4005d4f5f 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
@@ -1,50 +1,65 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Security;
 using System.Threading.Tasks;
-using Avalonia.Metadata;
 
 namespace Avalonia.Platform.Storage.FileIO;
 
-[Unstable]
-public class BclStorageFile : IStorageBookmarkFile
+internal class BclStorageFile : IStorageBookmarkFile
 {
-    private readonly FileInfo _fileInfo;
-
     public BclStorageFile(string fileName)
     {
-        _fileInfo = new FileInfo(fileName);
+        FileInfo = new FileInfo(fileName);
     }
 
     public BclStorageFile(FileInfo fileInfo)
     {
-        _fileInfo = fileInfo ?? throw new ArgumentNullException(nameof(fileInfo));
+        FileInfo = fileInfo ?? throw new ArgumentNullException(nameof(fileInfo));
     }
 
+    public FileInfo FileInfo { get; }
+
     public bool CanOpenRead => true;
 
     public bool CanOpenWrite => true;
 
-    public string Name => _fileInfo.Name;
+    public string Name => FileInfo.Name;
 
     public virtual bool CanBookmark => true;
 
+    public Uri Path
+    {
+        get
+        {
+            try
+            {
+                if (FileInfo.Directory is not null)
+                {
+                    return StorageProviderHelpers.FilePathToUri(FileInfo.FullName);
+                } 
+            }
+            catch (SecurityException)
+            {
+            }
+            return new Uri(FileInfo.Name, UriKind.Relative);
+        }
+    }
+    
     public Task<StorageItemProperties> GetBasicPropertiesAsync()
     {
-        if (_fileInfo.Exists)
+        if (FileInfo.Exists)
         {
             return Task.FromResult(new StorageItemProperties(
-                (ulong)_fileInfo.Length,
-                _fileInfo.CreationTimeUtc,
-                _fileInfo.LastAccessTimeUtc));
+                (ulong)FileInfo.Length,
+                FileInfo.CreationTimeUtc,
+                FileInfo.LastAccessTimeUtc));
         }
         return Task.FromResult(new StorageItemProperties());
     }
 
     public Task<IStorageFolder?> GetParentAsync()
     {
-        if (_fileInfo.Directory is { } directory)
+        if (FileInfo.Directory is { } directory)
         {
             return Task.FromResult<IStorageFolder?>(new BclStorageFolder(directory));
         }
@@ -53,17 +68,17 @@ public class BclStorageFile : IStorageBookmarkFile
 
     public Task<Stream> OpenReadAsync()
     {
-        return Task.FromResult<Stream>(_fileInfo.OpenRead());
+        return Task.FromResult<Stream>(FileInfo.OpenRead());
     }
 
     public Task<Stream> OpenWriteAsync()
     {
-        return Task.FromResult<Stream>(_fileInfo.OpenWrite());
+        return Task.FromResult<Stream>(FileInfo.OpenWrite());
     }
 
     public virtual Task<string?> SaveBookmarkAsync()
     {
-        return Task.FromResult<string?>(_fileInfo.FullName);
+        return Task.FromResult<string?>(FileInfo.FullName);
     }
 
     public Task ReleaseBookmarkAsync()
@@ -72,28 +87,6 @@ public class BclStorageFile : IStorageBookmarkFile
         return Task.CompletedTask;
     }
 
-    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
-    {
-        try
-        {
-            if (_fileInfo.Directory is not null)
-            {
-                uri = Path.IsPathRooted(_fileInfo.FullName) ?
-                    new Uri(new Uri("file://"), _fileInfo.FullName) :
-                    new Uri(_fileInfo.FullName, UriKind.Relative);
-                return true;
-            }
-
-            uri = null;
-            return false;
-        }
-        catch (SecurityException)
-        {
-            uri = null;
-            return false;
-        }
-    }
-
     protected virtual void Dispose(bool disposing)
     {
     }
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
index b91e910777..1e21c197bb 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
@@ -1,23 +1,18 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Security;
 using System.Threading.Tasks;
-using Avalonia.Metadata;
 
 namespace Avalonia.Platform.Storage.FileIO;
 
-[Unstable]
-public class BclStorageFolder : IStorageBookmarkFolder
+internal class BclStorageFolder : IStorageBookmarkFolder
 {
-    private readonly DirectoryInfo _directoryInfo;
-
     public BclStorageFolder(string path)
     {
-        _directoryInfo = new DirectoryInfo(path);
-        if (!_directoryInfo.Exists)
+        DirectoryInfo = new DirectoryInfo(path);
+        if (!DirectoryInfo.Exists)
         {
             throw new ArgumentException("Directory must exist");
         }
@@ -25,29 +20,46 @@ public class BclStorageFolder : IStorageBookmarkFolder
 
     public BclStorageFolder(DirectoryInfo directoryInfo)
     {
-        _directoryInfo = directoryInfo ?? throw new ArgumentNullException(nameof(directoryInfo));
-        if (!_directoryInfo.Exists)
+        DirectoryInfo = directoryInfo ?? throw new ArgumentNullException(nameof(directoryInfo));
+        if (!DirectoryInfo.Exists)
         {
             throw new ArgumentException("Directory must exist", nameof(directoryInfo));
         }
     }
 
-    public string Name => _directoryInfo.Name;
+    public string Name => DirectoryInfo.Name;
+
+    public DirectoryInfo DirectoryInfo { get; }
 
     public bool CanBookmark => true;
 
+    public Uri Path
+    {
+        get
+        {
+            try
+            {
+                return StorageProviderHelpers.FilePathToUri(DirectoryInfo.FullName);
+            }
+            catch (SecurityException)
+            {
+                return new Uri(DirectoryInfo.Name, UriKind.Relative);
+            }
+        }
+    }
+    
     public Task<StorageItemProperties> GetBasicPropertiesAsync()
     {
         var props = new StorageItemProperties(
             null,
-            _directoryInfo.CreationTimeUtc,
-            _directoryInfo.LastAccessTimeUtc);
+            DirectoryInfo.CreationTimeUtc,
+            DirectoryInfo.LastAccessTimeUtc);
         return Task.FromResult(props);
     }
 
     public Task<IStorageFolder?> GetParentAsync()
     {
-        if (_directoryInfo.Parent is { } directory)
+        if (DirectoryInfo.Parent is { } directory)
         {
             return Task.FromResult<IStorageFolder?>(new BclStorageFolder(directory));
         }
@@ -56,9 +68,9 @@ public class BclStorageFolder : IStorageBookmarkFolder
 
     public Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
     {
-         var items = _directoryInfo.GetDirectories()
+         var items = DirectoryInfo.GetDirectories()
             .Select(d => (IStorageItem)new BclStorageFolder(d))
-            .Concat(_directoryInfo.GetFiles().Select(f => new BclStorageFile(f)))
+            .Concat(DirectoryInfo.GetFiles().Select(f => new BclStorageFile(f)))
             .ToArray();
 
          return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
@@ -66,7 +78,7 @@ public class BclStorageFolder : IStorageBookmarkFolder
 
     public virtual Task<string?> SaveBookmarkAsync()
     {
-        return Task.FromResult<string?>(_directoryInfo.FullName);
+        return Task.FromResult<string?>(DirectoryInfo.FullName);
     }
     
     public Task ReleaseBookmarkAsync()
@@ -75,23 +87,6 @@ public class BclStorageFolder : IStorageBookmarkFolder
         return Task.CompletedTask;
     }
 
-    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
-    {
-        try
-        {
-            uri = Path.IsPathRooted(_directoryInfo.FullName) ?
-                new Uri(new Uri("file://"), _directoryInfo.FullName) :
-                new Uri(_directoryInfo.FullName, UriKind.Relative);
-
-            return true;
-        }
-        catch (SecurityException)
-        {
-            uri = null;
-            return false;
-        }
-    }
-
     protected virtual void Dispose(bool disposing)
     {
     }
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
index 469388021e..ee169d62a5 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
@@ -1,12 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using Avalonia.Metadata;
+using Avalonia.Compatibility;
 
 namespace Avalonia.Platform.Storage.FileIO;
 
-[Unstable]
-public abstract class BclStorageProvider : IStorageProvider
+internal abstract class BclStorageProvider : IStorageProvider
 {
     public abstract bool CanOpen { get; }
     public abstract Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options);
@@ -32,4 +33,98 @@ public abstract class BclStorageProvider : IStorageProvider
             ? Task.FromResult<IStorageBookmarkFolder?>(new BclStorageFolder(folder))
             : Task.FromResult<IStorageBookmarkFolder?>(null);
     }
+
+    public virtual Task<IStorageFile?> TryGetFileFromPath(Uri filePath)
+    {
+        if (filePath.IsAbsoluteUri)
+        {
+            var file = new FileInfo(filePath.LocalPath);
+            if (file.Exists)
+            {
+                return Task.FromResult<IStorageFile?>(new BclStorageFile(file));
+            }
+        }
+
+        return Task.FromResult<IStorageFile?>(null);
+    }
+
+    public virtual Task<IStorageFolder?> TryGetFolderFromPath(Uri folderPath)
+    {
+        if (folderPath.IsAbsoluteUri)
+        {
+            var directory = new DirectoryInfo(folderPath.LocalPath);
+            if (directory.Exists)
+            {
+                return Task.FromResult<IStorageFolder?>(new BclStorageFolder(directory));
+            }
+        }
+
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public virtual Task<IStorageFolder?> TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+    {
+        // Note, this BCL API returns different values depending on the .NET version.
+        // We should also document it. 
+        // https://github.com/dotnet/docs/issues/31423
+        // For pre-breaking change values see table:
+        // https://johnkoerner.com/csharp/special-folder-values-on-windows-versus-mac/
+        var folderPath = wellKnownFolder switch
+        {
+            WellKnownFolder.Desktop => GetFromSpecialFolder(Environment.SpecialFolder.Desktop),
+            WellKnownFolder.Documents => GetFromSpecialFolder(Environment.SpecialFolder.MyDocuments),
+            WellKnownFolder.Downloads => GetDownloadsWellKnownFolder(),
+            WellKnownFolder.Music => GetFromSpecialFolder(Environment.SpecialFolder.MyMusic),
+            WellKnownFolder.Pictures => GetFromSpecialFolder(Environment.SpecialFolder.MyPictures),
+            WellKnownFolder.Videos => GetFromSpecialFolder(Environment.SpecialFolder.MyVideos),
+            _ => throw new ArgumentOutOfRangeException(nameof(wellKnownFolder), wellKnownFolder, null)
+        };
+
+        if (folderPath is null)
+        {
+            return Task.FromResult<IStorageFolder?>(null);
+        }
+
+        var directory = new DirectoryInfo(folderPath);
+        if (!directory.Exists)
+        {
+            return Task.FromResult<IStorageFolder?>(null);
+        }
+        
+        return Task.FromResult<IStorageFolder?>(new BclStorageFolder(directory));
+
+        string GetFromSpecialFolder(Environment.SpecialFolder folder) =>
+            Environment.GetFolderPath(folder, Environment.SpecialFolderOption.Create);
+    }
+
+    // TODO, replace with https://github.com/dotnet/runtime/issues/70484 when implemented.
+    // Normally we want to avoid platform specific code in the Avalonia.Base assembly.
+    protected static string? GetDownloadsWellKnownFolder()
+    {
+        if (OperatingSystemEx.IsWindows())
+        {
+            return Environment.OSVersion.Version.Major < 6 ? null :
+                SHGetKnownFolderPath(s_folderDownloads, 0, IntPtr.Zero);
+        }
+
+        if (OperatingSystemEx.IsLinux())
+        {
+            var envDir = Environment.GetEnvironmentVariable("XDG_DOWNLOAD_DIR");
+            if (envDir != null && Directory.Exists(envDir))
+            {
+                return envDir;
+            }
+        }
+
+        if (OperatingSystemEx.IsLinux() || OperatingSystemEx.IsMacOS())
+        {
+            return "~/Downloads";
+        }
+
+        return null;
+    }
+    
+    private static readonly Guid s_folderDownloads = new Guid("374DE290-123F-4565-9164-39C4925E467B");
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
+    private static extern string SHGetKnownFolderPath([MarshalAs(UnmanagedType.LPStruct)] Guid id, int flags, IntPtr token);
 }
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
index f90d0a5a2f..55e84ee937 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
@@ -1,13 +1,23 @@
 using System;
 using System.IO;
 using System.Linq;
-using Avalonia.Metadata;
+using System.Text;
 
 namespace Avalonia.Platform.Storage.FileIO;
 
-[Unstable]
-public static class StorageProviderHelpers
+internal static class StorageProviderHelpers
 {
+    public static Uri FilePathToUri(string path)
+    {
+        var uriPath = new StringBuilder(path)
+            .Replace("%", $"%{(int)'%':X2}")
+            .Replace("[", $"%{(int)'[':X2}")
+            .Replace("]", $"%{(int)']':X2}")
+            .ToString();
+
+        return new UriBuilder("file", string.Empty) { Path = uriPath }.Uri;
+    }
+    
     public static string NameWithExtension(string path, string? defaultExtension, FilePickerFileType? filter)
     {
         var name = Path.GetFileName(path);
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
index f5469d31c9..c2c93400b0 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
@@ -20,13 +20,13 @@ public interface IStorageItem : IDisposable
     string Name { get; }
 
     /// <summary>
-    /// Gets the full file-system path of the item, if the item has a path.
+    /// Gets the file-system path of the item.
     /// </summary>
     /// <remarks>
     /// Android backend might return file path with "content:" scheme.
     /// Browser and iOS backends might return relative uris.
     /// </remarks>
-    bool TryGetUri([NotNullWhen(true)] out Uri? uri);
+    Uri Path { get; }
 
     /// <summary>
     /// Gets the basic properties of the current item.
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
index 0f5cf931d9..6922151e02 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageProvider.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Avalonia.Metadata;
 
@@ -53,4 +55,35 @@ public interface IStorageProvider
     /// <param name="bookmark">Bookmark ID.</param>
     /// <returns>Bookmarked folder or null if OS denied request.</returns>
     Task<IStorageBookmarkFolder?> OpenFolderBookmarkAsync(string bookmark);
+
+    /// <summary>
+    /// Attempts to read file from the file-system by its path.
+    /// </summary>
+    /// <param name="filePath">The path of the item to retrieve in Uri format.</param>
+    /// <remarks>
+    /// Uri path is usually expected to be an absolute path with "file" scheme.
+    /// But it can be an uri with "content" scheme on the Android.
+    /// It also might ask user for the permission, and throw an exception if it was denied.
+    /// </remarks>
+    /// <returns>File or null if it doesn't exist.</returns>
+    Task<IStorageFile?> TryGetFileFromPath(Uri filePath);
+    
+    /// <summary>
+    /// Attempts to read folder from the file-system by its path.
+    /// </summary>
+    /// <param name="folderPath">The path of the folder to retrieve in Uri format.</param>
+    /// <remarks>
+    /// Uri path is usually expected to be an absolute path with "file" scheme.
+    /// But it can be an uri with "content" scheme on the Android. 
+    /// It also might ask user for the permission, and throw an exception if it was denied.
+    /// </remarks>
+    /// <returns>Folder or null if it doesn't exist.</returns>
+    Task<IStorageFolder?> TryGetFolderFromPath(Uri folderPath);
+    
+    /// <summary>
+    /// Attempts to read folder from the file-system by its path
+    /// </summary>
+    /// <param name="wellKnownFolder">Well known folder identifier.</param>
+    /// <returns>Folder or null if it doesn't exist.</returns>
+    Task<IStorageFolder?> TryGetWellKnownFolder(WellKnownFolder wellKnownFolder);
 }
diff --git a/src/Avalonia.Base/Platform/Storage/NameCollisionOption.cs b/src/Avalonia.Base/Platform/Storage/NameCollisionOption.cs
new file mode 100644
index 0000000000..4a0d0c634f
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/NameCollisionOption.cs
@@ -0,0 +1,6 @@
+namespace Avalonia.Platform.Storage;
+
+public class NameCollisionOption
+{
+    
+}
diff --git a/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs b/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
new file mode 100644
index 0000000000..c7772d1196
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage.FileIO;
+
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Group of public extensions for <see cref="IStorageProvider"/> class. 
+/// </summary>
+public static class StorageProviderExtensions
+{
+    /// <inheritdoc cref="IStorageProvider.TryGetFileFromPath"/>
+    public static Task<IStorageFile?> TryGetFileFromPath(this IStorageProvider provider, string filePath)
+    {
+        return provider.TryGetFileFromPath(StorageProviderHelpers.FilePathToUri(filePath));
+    }
+
+    /// <inheritdoc cref="IStorageProvider.TryGetFolderFromPath"/>
+    public static Task<IStorageFolder?> TryGetFolderFromPath(this IStorageProvider provider, string folderPath)
+    {
+        return provider.TryGetFolderFromPath(StorageProviderHelpers.FilePathToUri(folderPath));
+    }
+
+    internal static string? TryGetFullPath(this IStorageFolder folder)
+    {
+        // We can avoid double escaping of the path by checking for BclStorageFolder.
+        // Ideally, `folder.Path.LocalPath` should also work, as that's only available way for the users.
+        if (folder is BclStorageFolder storageFolder)
+        {
+            return storageFolder.DirectoryInfo.FullName;
+        }
+
+        if (folder.Path is { IsAbsoluteUri: true, Scheme: "file" } absolutePath)
+        {
+            return absolutePath.LocalPath;
+        }
+
+        // android "content:", browser and ios relative links go here. 
+        return null;
+    }
+    
+    internal static string? TryGetFullPath(this IStorageFile file)
+    {
+        if (file is BclStorageFile storageFolder)
+        {
+            return storageFolder.FileInfo.FullName;
+        }
+
+        if (file.Path is { IsAbsoluteUri: true, Scheme: "file" } absolutePath)
+        {
+            return absolutePath.LocalPath;
+        }
+
+        return null;
+    }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/WellKnownFolder.cs b/src/Avalonia.Base/Platform/Storage/WellKnownFolder.cs
new file mode 100644
index 0000000000..fcc933bc53
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/WellKnownFolder.cs
@@ -0,0 +1,37 @@
+namespace Avalonia.Platform.Storage;
+
+/// <summary>
+/// Specifies enumerated constants used to retrieve directory paths to system well known folders.
+/// </summary>
+public enum WellKnownFolder
+{
+    /// <summary>
+    /// Current user desktop folder.
+    /// </summary>
+    Desktop,
+    
+    /// <summary>
+    /// Current user documents folder.
+    /// </summary>
+    Documents,
+    
+    /// <summary>
+    /// Current user downloads folder.
+    /// </summary>
+    Downloads,
+    
+    /// <summary>
+    /// Current user music folder
+    /// </summary>
+    Music,
+    
+    /// <summary>
+    /// Current user pictures folder
+    /// </summary>
+    Pictures,
+
+    /// <summary>
+    /// Current user videos folder
+    /// </summary>
+    Videos,
+}
diff --git a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
index 93fffb3755..3e20dcce56 100644
--- a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
+++ b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
@@ -19,7 +19,7 @@ namespace Avalonia.PropertyStore
         private T? _baseValue;
         private UncommonFields? _uncommon;
 
-        public EffectiveValue(AvaloniaObject owner, StyledPropertyBase<T> property)
+        public EffectiveValue(AvaloniaObject owner, StyledProperty<T> property)
         {
             Priority = BindingPriority.Unset;
             BasePriority = BindingPriority.Unset;
@@ -57,12 +57,12 @@ namespace Avalonia.PropertyStore
             Debug.Assert(priority != BindingPriority.LocalValue);
             UpdateValueEntry(value, priority);
 
-            SetAndRaiseCore(owner,  (StyledPropertyBase<T>)value.Property, GetValue(value), priority);
+            SetAndRaiseCore(owner,  (StyledProperty<T>)value.Property, GetValue(value), priority);
         }
 
         public void SetLocalValueAndRaise(
             ValueStore owner,
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             T value)
         {
             SetAndRaiseCore(owner, property, value, BindingPriority.LocalValue);
@@ -82,7 +82,7 @@ namespace Avalonia.PropertyStore
         {
             Debug.Assert(oldValue is not null || newValue is not null);
 
-            var p = (StyledPropertyBase<T>)property;
+            var p = (StyledProperty<T>)property;
             var o = oldValue is not null ? ((EffectiveValue<T>)oldValue).Value : _metadata.DefaultValue;
             var n = newValue is not null ? ((EffectiveValue<T>)newValue).Value : _metadata.DefaultValue;
             var priority = newValue is not null ? BindingPriority.Inherited : BindingPriority.Unset;
@@ -98,7 +98,7 @@ namespace Avalonia.PropertyStore
             Debug.Assert(Priority != BindingPriority.Animation);
             Debug.Assert(BasePriority != BindingPriority.Unset);
             UpdateValueEntry(null, BindingPriority.Animation);
-            SetAndRaiseCore(owner, (StyledPropertyBase<T>)property, _baseValue!, BasePriority);
+            SetAndRaiseCore(owner, (StyledProperty<T>)property, _baseValue!, BasePriority);
         }
 
         public override void CoerceValue(ValueStore owner, AvaloniaProperty property)
@@ -107,7 +107,7 @@ namespace Avalonia.PropertyStore
                 return;
             SetAndRaiseCore(
                 owner, 
-                (StyledPropertyBase<T>)property, 
+                (StyledProperty<T>)property, 
                 _uncommon._uncoercedValue!, 
                 Priority, 
                 _uncommon._uncoercedBaseValue!,
@@ -117,10 +117,10 @@ namespace Avalonia.PropertyStore
         public override void DisposeAndRaiseUnset(ValueStore owner, AvaloniaProperty property)
         {
             UnsubscribeValueEntries();
-            DisposeAndRaiseUnset(owner, (StyledPropertyBase<T>)property);
+            DisposeAndRaiseUnset(owner, (StyledProperty<T>)property);
         }
 
-        public void DisposeAndRaiseUnset(ValueStore owner, StyledPropertyBase<T> property)
+        public void DisposeAndRaiseUnset(ValueStore owner, StyledProperty<T> property)
         {
             BindingPriority priority;
             T oldValue;
@@ -156,7 +156,7 @@ namespace Avalonia.PropertyStore
 
         private void SetAndRaiseCore(
             ValueStore owner,
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             T value,
             BindingPriority priority)
         {
@@ -203,7 +203,7 @@ namespace Avalonia.PropertyStore
 
         private void SetAndRaiseCore(
             ValueStore owner,
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             T value,
             BindingPriority priority,
             T baseValue,
diff --git a/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs b/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs
index 364b4e1225..d8a353dc70 100644
--- a/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/ImmediateValueEntry.cs
@@ -9,7 +9,7 @@ namespace Avalonia.PropertyStore
 
         public ImmediateValueEntry(
             ImmediateValueFrame owner,
-            StyledPropertyBase<T> property, 
+            StyledProperty<T> property, 
             T value)
         {
             _owner = owner;
@@ -17,7 +17,7 @@ namespace Avalonia.PropertyStore
             Property = property;
         }
 
-        public StyledPropertyBase<T> Property { get; }
+        public StyledProperty<T> Property { get; }
         public bool HasValue => true;
         AvaloniaProperty IValueEntry.Property => Property;
 
diff --git a/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs b/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs
index 50d5333b9f..7e9f3ab312 100644
--- a/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs
+++ b/src/Avalonia.Base/PropertyStore/ImmediateValueFrame.cs
@@ -15,7 +15,7 @@ namespace Avalonia.PropertyStore
         }
 
         public TypedBindingEntry<T> AddBinding<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<BindingValue<T>> source)
         {
             var e = new TypedBindingEntry<T>(this, property, source);
@@ -24,7 +24,7 @@ namespace Avalonia.PropertyStore
         }
 
         public TypedBindingEntry<T> AddBinding<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<T> source)
         {
             var e = new TypedBindingEntry<T>(this, property, source);
@@ -33,7 +33,7 @@ namespace Avalonia.PropertyStore
         }
 
         public SourceUntypedBindingEntry<T> AddBinding<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<object?> source)
         {
             var e = new SourceUntypedBindingEntry<T>(this, property, source);
@@ -41,7 +41,7 @@ namespace Avalonia.PropertyStore
             return e;
         }
 
-        public ImmediateValueEntry<T> AddValue<T>(StyledPropertyBase<T> property, T value)
+        public ImmediateValueEntry<T> AddValue<T>(StyledProperty<T> property, T value)
         {
             var e = new ImmediateValueEntry<T>(this, property, value);
             Add(e);
diff --git a/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs b/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs
index 8acb885604..f89cb029b6 100644
--- a/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs
+++ b/src/Avalonia.Base/PropertyStore/LocalValueBindingObserver.cs
@@ -11,13 +11,13 @@ namespace Avalonia.PropertyStore
         private readonly ValueStore _owner;
         private IDisposable? _subscription;
 
-        public LocalValueBindingObserver(ValueStore owner, StyledPropertyBase<T> property)
+        public LocalValueBindingObserver(ValueStore owner, StyledProperty<T> property)
         {
             _owner = owner;
             Property = property;
         }
 
-        public StyledPropertyBase<T> Property { get;}
+        public StyledProperty<T> Property { get;}
 
         public void Start(IObservable<T> source)
         {
@@ -41,7 +41,7 @@ namespace Avalonia.PropertyStore
 
         public void OnNext(T value)
         {
-            static void Execute(ValueStore owner, StyledPropertyBase<T> property, T value)
+            static void Execute(ValueStore owner, StyledProperty<T> property, T value)
             {
                 if (property.ValidateValue?.Invoke(value) != false)
                     owner.SetValue(property, value, BindingPriority.LocalValue);
diff --git a/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs b/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs
index 7c529591b6..2d157b2519 100644
--- a/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs
+++ b/src/Avalonia.Base/PropertyStore/LocalValueUntypedBindingObserver.cs
@@ -11,13 +11,13 @@ namespace Avalonia.PropertyStore
         private readonly ValueStore _owner;
         private IDisposable? _subscription;
 
-        public LocalValueUntypedBindingObserver(ValueStore owner, StyledPropertyBase<T> property)
+        public LocalValueUntypedBindingObserver(ValueStore owner, StyledProperty<T> property)
         {
             _owner = owner;
             Property = property;
         }
 
-        public StyledPropertyBase<T> Property { get; }
+        public StyledProperty<T> Property { get; }
 
         public void Start(IObservable<object?> source)
         {
diff --git a/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs b/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs
index b4ac06d2bf..b56d0d4529 100644
--- a/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/SourceUntypedBindingEntry.cs
@@ -13,14 +13,14 @@ namespace Avalonia.PropertyStore
 
         public SourceUntypedBindingEntry(
             ValueFrame frame, 
-            StyledPropertyBase<TTarget> property,
+            StyledProperty<TTarget> property,
             IObservable<object?> source)
                 : base(frame, property, source)
         {
             _validate = property.ValidateValue;
         }
 
-        public new StyledPropertyBase<TTarget> Property => (StyledPropertyBase<TTarget>)base.Property;
+        public new StyledProperty<TTarget> Property => (StyledProperty<TTarget>)base.Property;
 
         protected override BindingValue<TTarget> ConvertAndValidate(object? value)
         {
diff --git a/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs b/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs
index 2276991a18..697725c87b 100644
--- a/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/TypedBindingEntry.cs
@@ -11,7 +11,7 @@ namespace Avalonia.PropertyStore
     {
         public TypedBindingEntry(
             ValueFrame frame, 
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<T> source)
                 : base(frame, property, source)
         {
@@ -19,13 +19,13 @@ namespace Avalonia.PropertyStore
 
         public TypedBindingEntry(
             ValueFrame frame,
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<BindingValue<T>> source)
                 : base(frame, property, source)
         {
         }
 
-        public new StyledPropertyBase<T> Property => (StyledPropertyBase<T>)base.Property;
+        public new StyledProperty<T> Property => (StyledProperty<T>)base.Property;
 
         protected override BindingValue<T> ConvertAndValidate(T value)
         {
diff --git a/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs b/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs
index 5c5591dcb5..372a808fb2 100644
--- a/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs
+++ b/src/Avalonia.Base/PropertyStore/UntypedValueUtils.cs
@@ -26,7 +26,7 @@ namespace Avalonia.PropertyStore
 
         [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
         public static bool TryConvertAndValidate<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             object? value, 
             [MaybeNullWhen(false)] out T result)
         {
diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index 92e5288255..f36a96992b 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -43,7 +43,7 @@ namespace Avalonia.PropertyStore
         }
 
         public IDisposable AddBinding<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<BindingValue<T>> source,
             BindingPriority priority)
         {
@@ -71,7 +71,7 @@ namespace Avalonia.PropertyStore
         }
 
         public IDisposable AddBinding<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<T> source,
             BindingPriority priority)
         {
@@ -99,7 +99,7 @@ namespace Avalonia.PropertyStore
         }
 
         public IDisposable AddBinding<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             IObservable<object?> source,
             BindingPriority priority)
         {
@@ -165,7 +165,7 @@ namespace Avalonia.PropertyStore
             }
         }
 
-        public IDisposable? SetValue<T>(StyledPropertyBase<T> property, T value, BindingPriority priority)
+        public IDisposable? SetValue<T>(StyledProperty<T> property, T value, BindingPriority priority)
         {
             if (property.ValidateValue?.Invoke(value) == false)
             {
@@ -219,7 +219,7 @@ namespace Avalonia.PropertyStore
             return GetDefaultValue(property);
         }
 
-        public T GetValue<T>(StyledPropertyBase<T> property)
+        public T GetValue<T>(StyledProperty<T> property)
         {
             if (_effectiveValues.TryGetValue(property, out var v))
                 return ((EffectiveValue<T>)v).Value;
@@ -248,7 +248,7 @@ namespace Avalonia.PropertyStore
                 v.CoerceValue(this, property);
         }
 
-        public Optional<T> GetBaseValue<T>(StyledPropertyBase<T> property)
+        public Optional<T> GetBaseValue<T>(StyledProperty<T> property)
         {
             if (TryGetEffectiveValue(property, out var v) &&
                 ((EffectiveValue<T>)v).TryGetBaseValue(out var baseValue))
@@ -450,7 +450,7 @@ namespace Avalonia.PropertyStore
         /// <param name="oldValue">The old value of the property.</param>
         /// <param name="value">The effective value instance.</param>
         public void OnInheritedEffectiveValueChanged<T>(
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             T oldValue,
             EffectiveValue<T> value)
         {
@@ -475,7 +475,7 @@ namespace Avalonia.PropertyStore
         /// </summary>
         /// <param name="property">The property whose value changed.</param>
         /// <param name="oldValue">The old value of the property.</param>
-        public void OnInheritedEffectiveValueDisposed<T>(StyledPropertyBase<T> property, T oldValue)
+        public void OnInheritedEffectiveValueDisposed<T>(StyledProperty<T> property, T oldValue)
         {
             Debug.Assert(property.Inherits);
 
@@ -520,7 +520,7 @@ namespace Avalonia.PropertyStore
         /// <param name="oldValue">The old value of the property.</param>
         /// <param name="newValue">The new value of the property.</param>
         public void OnAncestorInheritedValueChanged<T>(
-            StyledPropertyBase<T> property, 
+            StyledProperty<T> property, 
             T oldValue,
             T newValue)
         {
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
index b2080aeb87..a2209db09f 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
@@ -28,7 +28,7 @@ public class CompositingRenderer : IRendererWithCompositor
     private HashSet<Visual> _dirty = new();
     private HashSet<Visual> _recalculateChildren = new();
     private bool _queuedUpdate;
-    private Action<Task> _update;
+    private Action _update;
     private bool _updating;
 
     internal CompositionTarget CompositionTarget;
@@ -70,7 +70,7 @@ public class CompositingRenderer : IRendererWithCompositor
         if(_queuedUpdate)
             return;
         _queuedUpdate = true;
-        _compositor.InvokeBeforeNextCommit(_update);
+        _compositor.RequestCompositionUpdate(_update);
     }
     
     /// <inheritdoc/>
@@ -265,7 +265,7 @@ public class CompositingRenderer : IRendererWithCompositor
         SceneInvalidated?.Invoke(this, new SceneInvalidatedEventArgs(_root, new Rect(_root.ClientSize)));
     }
     
-    private void Update(Task batchCompletion)
+    private void Update()
     {
         if(_updating)
             return;
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionDrawingSurface.cs b/src/Avalonia.Base/Rendering/Composition/CompositionDrawingSurface.cs
new file mode 100644
index 0000000000..2f7e261250
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionDrawingSurface.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Rendering.Composition.Server;
+
+namespace Avalonia.Rendering.Composition;
+
+public class CompositionDrawingSurface : CompositionSurface
+{
+    internal new ServerCompositionDrawingSurface Server => (ServerCompositionDrawingSurface)base.Server;
+    internal CompositionDrawingSurface(Compositor compositor) : base(compositor, new ServerCompositionDrawingSurface(compositor.Server))
+    {
+    }
+
+    /// <summary>
+    /// Updates the surface contents using an imported memory image using a keyed mutex as the means of synchronization
+    /// </summary>
+    /// <param name="image">GPU image with new surface contents</param>
+    /// <param name="acquireIndex">The mutex key to wait for before accessing the image</param>
+    /// <param name="releaseIndex">The mutex key to release for after accessing the image </param>
+    /// <returns>A task that completes when update operation is completed and user code is free to destroy or dispose the image</returns>
+    public Task UpdateWithKeyedMutexAsync(ICompositionImportedGpuImage image, uint acquireIndex, uint releaseIndex)
+    {
+        var img = (CompositionImportedGpuImage)image;
+        return Compositor.InvokeServerJobAsync(() => Server.UpdateWithKeyedMutex(img, acquireIndex, releaseIndex));
+    }
+
+    /// <summary>
+    /// Updates the surface contents using an imported memory image using a semaphore pair as the means of synchronization
+    /// </summary>
+    /// <param name="image">GPU image with new surface contents</param>
+    /// <param name="waitForSemaphore">The semaphore to wait for before accessing the image</param>
+    /// <param name="signalSemaphore">The semaphore to signal after accessing the image</param>
+    /// <returns>A task that completes when update operation is completed and user code is free to destroy or dispose the image</returns>
+    public Task UpdateWithSemaphoresAsync(ICompositionImportedGpuImage image,
+        ICompositionImportedGpuSemaphore waitForSemaphore,
+        ICompositionImportedGpuSemaphore signalSemaphore)
+    {
+        var img = (CompositionImportedGpuImage)image;
+        var wait = (CompositionImportedGpuSemaphore)waitForSemaphore;
+        var signal = (CompositionImportedGpuSemaphore)signalSemaphore;
+        return Compositor.InvokeServerJobAsync(() => Server.UpdateWithSemaphores(img, wait, signal));
+    }
+
+    /// <summary>
+    /// Updates the surface contents using an unspecified automatic means of synchronization
+    /// provided by the underlying platform
+    /// </summary>
+    /// <param name="image">GPU image with new surface contents</param>
+    /// <returns>A task that completes when update operation is completed and user code is free to destroy or dispose the image</returns>
+    public Task UpdateAsync(ICompositionImportedGpuImage image)
+    {
+        var img = (CompositionImportedGpuImage)image;
+        return Compositor.InvokeServerJobAsync(() => Server.UpdateWithAutomaticSync(img));
+    }
+
+    ~CompositionDrawingSurface()
+    {
+        Dispose();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs b/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
new file mode 100644
index 0000000000..ce728f86a2
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.Composition;
+public interface ICompositionGpuInterop
+{
+    /// <summary>
+    /// Returns the list of image handle types supported by the current GPU backend, see <see cref="KnownPlatformGraphicsExternalImageHandleTypes"/>
+    /// </summary>
+    IReadOnlyList<string> SupportedImageHandleTypes { get; }
+    
+    /// <summary>
+    /// Returns the list of semaphore types supported by the current GPU backend, see <see cref="KnownPlatformGraphicsExternalSemaphoreHandleTypes"/>
+    /// </summary>
+    IReadOnlyList<string> SupportedSemaphoreTypes { get; }
+
+    /// <summary>
+    /// Returns the supported ways to synchronize access to the imported GPU image
+    /// </summary>
+    /// <returns></returns>
+    CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType);
+    
+    /// <summary>
+    /// Asynchronously imports a texture. The returned object is immediately usable.
+    /// </summary>
+    ICompositionImportedGpuImage ImportImage(IPlatformHandle handle,
+        PlatformGraphicsExternalImageProperties properties);
+
+    /// <summary>
+    /// Asynchronously imports a texture. The returned object is immediately usable.
+    /// If import operation fails, the caller is responsible for destroying the handle
+    /// </summary>
+    /// <param name="image">An image that belongs to the same GPU context or the same GPU context sharing group as one used by compositor</param>
+    ICompositionImportedGpuImage ImportImage(ICompositionImportableSharedGpuContextImage image);
+
+    /// <summary>
+    /// Asynchronously imports a semaphore object. The returned object is immediately usable.
+    /// If import operation fails, the caller is responsible for destroying the handle
+    /// </summary>
+    ICompositionImportedGpuSemaphore ImportSemaphore(IPlatformHandle handle);
+    
+    /// <summary>
+    /// Asynchronously imports a semaphore object. The returned object is immediately usable.
+    /// </summary>
+    /// <param name="image">A semaphore that belongs to the same GPU context or the same GPU context sharing group as one used by compositor</param>
+    ICompositionImportedGpuImage ImportSemaphore(ICompositionImportableSharedGpuContextSemaphore image);
+    
+    /// <summary>
+    /// Indicates if the device context this instance is associated with is no longer available
+    /// </summary>
+    public bool IsLost { get; }
+    
+    /// <summary>
+    /// The LUID of the graphics adapter used by the compositor
+    /// </summary>
+    public byte[]? DeviceLuid { get; set; }
+    
+    /// <summary>
+    /// The UUID of the graphics adapter used by the compositor
+    /// </summary>
+    public byte[]? DeviceUuid { get; set; }
+}
+
+[Flags]
+public enum CompositionGpuImportedImageSynchronizationCapabilities
+{
+    /// <summary>
+    /// Pre-render and after-render semaphores must be provided alongside with the image
+    /// </summary>
+    Semaphores = 1,
+    /// <summary>
+    /// Image must be created with D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX or in other compatible way
+    /// </summary>
+    KeyedMutex = 2,
+    /// <summary>
+    /// Synchronization and ordering is somehow handled by the underlying platform
+    /// </summary>
+    Automatic = 4
+}
+
+/// <summary>
+/// An imported GPU object that's usable by composition APIs 
+/// </summary>
+public interface ICompositionGpuImportedObject : IAsyncDisposable
+{
+    /// <summary>
+    /// Tracks the import status of the object. Once the task is completed,
+    /// the user code is allowed to free the resource owner in case when a non-owning
+    /// sharing handle was used
+    /// </summary>
+    Task ImportCompeted { get; }
+    /// <summary>
+    /// Indicates if the device context this instance is associated with is no longer available
+    /// </summary>
+    bool IsLost { get; }
+}
+
+/// <summary>
+/// An imported GPU image object that's usable by composition APIs 
+/// </summary>
+[NotClientImplementable]
+public interface ICompositionImportedGpuImage : ICompositionGpuImportedObject
+{
+
+}
+
+/// <summary>
+/// An imported GPU semaphore object that's usable by composition APIs 
+/// </summary>
+[NotClientImplementable]
+public interface ICompositionImportedGpuSemaphore : ICompositionGpuImportedObject
+{
+
+}
+
+/// <summary>
+/// An GPU object descriptor obtained from a context from the same share group as one used by the compositor
+/// </summary>
+[NotClientImplementable]
+public interface ICompositionImportableSharedGpuContextObject : IDisposable
+{
+}
+
+/// <summary>
+/// An GPU image descriptor obtained from a context from the same share group as one used by the compositor
+/// </summary>
+[NotClientImplementable]
+public interface ICompositionImportableSharedGpuContextImage : IDisposable
+{
+}
+
+/// <summary>
+/// An GPU semaphore descriptor obtained from a context from the same share group as one used by the compositor
+/// </summary>
+[NotClientImplementable]
+public interface ICompositionImportableSharedGpuContextSemaphore : IDisposable
+{
+}
+
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs b/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
new file mode 100644
index 0000000000..1643ec6e8d
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.Composition;
+
+internal class CompositionInterop : ICompositionGpuInterop
+{
+    private readonly Compositor _compositor;
+    private readonly IPlatformRenderInterfaceContext _context;
+    private readonly IExternalObjectsRenderInterfaceContextFeature _externalObjects;
+    
+
+    public CompositionInterop(
+        Compositor compositor,
+        IExternalObjectsRenderInterfaceContextFeature externalObjects)
+    {
+        _compositor = compositor;
+        _context = compositor.Server.RenderInterface.Value;
+        DeviceLuid = externalObjects.DeviceLuid;
+        DeviceUuid = externalObjects.DeviceUuid;
+        _externalObjects = externalObjects;
+    }
+
+    public IReadOnlyList<string> SupportedImageHandleTypes => _externalObjects.SupportedImageHandleTypes;
+    public IReadOnlyList<string> SupportedSemaphoreTypes => _externalObjects.SupportedSemaphoreTypes;
+
+    public CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType)
+        => _externalObjects.GetSynchronizationCapabilities(imageHandleType);
+
+    public ICompositionImportedGpuImage ImportImage(IPlatformHandle handle,
+        PlatformGraphicsExternalImageProperties properties)
+        => new CompositionImportedGpuImage(_compositor, _context, _externalObjects, 
+            () => _externalObjects.ImportImage(handle, properties));
+
+    public ICompositionImportedGpuImage ImportImage(ICompositionImportableSharedGpuContextImage image)
+    {
+        return new CompositionImportedGpuImage(_compositor, _context, _externalObjects,
+            () => _externalObjects.ImportImage(image));
+    }
+
+    public ICompositionImportedGpuSemaphore ImportSemaphore(IPlatformHandle handle)
+        => new CompositionImportedGpuSemaphore(handle, _compositor, _context, _externalObjects);
+
+    public ICompositionImportedGpuImage ImportSemaphore(ICompositionImportableSharedGpuContextSemaphore image)
+    {
+        throw new System.NotSupportedException();
+    }
+
+    public bool IsLost { get; }
+    public byte[]? DeviceLuid { get; set; }
+    public byte[]? DeviceUuid { get; set; }
+}
+
+abstract class CompositionGpuImportedObjectBase : ICompositionGpuImportedObject
+{
+    protected Compositor Compositor { get; }
+    public IPlatformRenderInterfaceContext Context { get; }
+    public IExternalObjectsRenderInterfaceContextFeature Feature { get; }
+
+    public CompositionGpuImportedObjectBase(Compositor compositor,
+        IPlatformRenderInterfaceContext context,
+        IExternalObjectsRenderInterfaceContextFeature feature)
+    {
+        Compositor = compositor;
+        Context = context;
+        Feature = feature;
+        
+        ImportCompeted = Compositor.InvokeServerJobAsync(Import);
+    }
+    
+    protected abstract void Import();
+    public abstract void Dispose();
+
+    public Task ImportCompeted { get; }
+    public bool IsLost => Context.IsLost;
+
+    public ValueTask DisposeAsync() => new(Compositor.InvokeServerJobAsync(() =>
+    {
+        if (ImportCompeted.Status == TaskStatus.RanToCompletion)
+            Dispose();
+    }));
+}
+
+class CompositionImportedGpuImage : CompositionGpuImportedObjectBase, ICompositionImportedGpuImage
+{
+    private readonly Func<IPlatformRenderInterfaceImportedImage> _importer;
+    private IPlatformRenderInterfaceImportedImage? _image;
+
+    public CompositionImportedGpuImage(Compositor compositor,
+        IPlatformRenderInterfaceContext context,
+        IExternalObjectsRenderInterfaceContextFeature feature,
+        Func<IPlatformRenderInterfaceImportedImage> importer): base(compositor, context, feature)
+    {
+        _importer = importer;
+    }
+
+    protected override void Import()
+    {
+        using (Compositor.Server.RenderInterface.EnsureCurrent())
+        {
+            // The original context was lost and the new one might have different capabilities
+            if (Context != Compositor.Server.RenderInterface.Value)
+                throw new PlatformGraphicsContextLostException();
+            _image = _importer();
+        }
+    }
+
+    public IPlatformRenderInterfaceImportedImage Image =>
+        _image ?? throw new ObjectDisposedException(nameof(CompositionImportedGpuImage));
+
+    public bool IsUsable => _image != null && Compositor.Server.RenderInterface.Value == Context;
+
+    public override void Dispose()
+    {
+        _image?.Dispose();
+        _image = null!;
+    }
+}
+
+class CompositionImportedGpuSemaphore : CompositionGpuImportedObjectBase, ICompositionImportedGpuSemaphore
+{
+    private readonly IPlatformHandle _handle;
+    private IPlatformRenderInterfaceImportedSemaphore? _semaphore;
+
+    public CompositionImportedGpuSemaphore(IPlatformHandle handle,
+        Compositor compositor, IPlatformRenderInterfaceContext context,
+        IExternalObjectsRenderInterfaceContextFeature feature) : base(compositor, context, feature)
+    {
+        _handle = handle;
+    }
+
+    public IPlatformRenderInterfaceImportedSemaphore Semaphore =>
+        _semaphore ?? throw new ObjectDisposedException(nameof(CompositionImportedGpuSemaphore));
+
+
+    public bool IsUsable => _semaphore != null && Compositor.Server.RenderInterface.Value == Context;
+
+    protected override void Import()
+    {
+        _semaphore = Feature.ImportSemaphore(_handle);
+    }
+
+    public override void Dispose()
+    {
+        _semaphore?.Dispose();
+        _semaphore = null;
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionSurface.cs b/src/Avalonia.Base/Rendering/Composition/CompositionSurface.cs
new file mode 100644
index 0000000000..0edd8ac732
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionSurface.cs
@@ -0,0 +1,10 @@
+using Avalonia.Rendering.Composition.Server;
+
+namespace Avalonia.Rendering.Composition;
+
+public class CompositionSurface : CompositionObject
+{
+    internal CompositionSurface(Compositor compositor, ServerObject server) : base(compositor, server)
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs
index 2b1b3f461f..6dba18704f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.Factories.cs
@@ -35,4 +35,8 @@ public partial class Compositor
         new(this, new ServerCompositionSolidColorVisual(Server));
 
     public CompositionCustomVisual CreateCustomVisual(CompositionCustomVisualHandler handler) => new(this, handler);
-}
\ No newline at end of file
+
+    public CompositionSurfaceVisual CreateSurfaceVisual() => new(this, new ServerCompositionSurfaceVisual(_server));
+
+    public CompositionDrawingSurface CreateDrawingSurface() => new(this);
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index 7fc5487171..bdcbe65403 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Rendering.Composition
         private BatchStreamObjectPool<object?> _batchObjectPool = new();
         private BatchStreamMemoryPool _batchMemoryPool = new();
         private List<CompositionObject> _objectsForSerialization = new();
-        private Queue<Action<Task>> _invokeBeforeCommit = new();
+        private Queue<Action> _invokeBeforeCommitWrite = new(), _invokeBeforeCommitRead = new();
         internal ServerCompositor Server => _server;
         private Task? _pendingBatch;
         private readonly object _pendingBatchLock = new();
@@ -77,16 +77,30 @@ namespace Avalonia.Rendering.Composition
 
             return _nextCommit.Task;
         }
-        
+
         internal Task Commit()
+        {
+            try
+            {
+                return CommitCore();
+            }
+            finally
+            {
+                if (_invokeBeforeCommitWrite.Count > 0)
+                    RequestCommitAsync();
+            }
+        }
+        
+        Task CommitCore()
         {
             Dispatcher.UIThread.VerifyAccess();
             using var noPump = NonPumpingLockHelper.Use();
             
             _nextCommit ??= new TaskCompletionSource<int>();
 
-            while (_invokeBeforeCommit.Count > 0)
-                _invokeBeforeCommit.Dequeue()(_nextCommit.Task);
+            (_invokeBeforeCommitRead, _invokeBeforeCommitWrite) = (_invokeBeforeCommitWrite, _invokeBeforeCommitRead);
+            while (_invokeBeforeCommitRead.Count > 0)
+                _invokeBeforeCommitRead.Dequeue()();
             
             var batch = new Batch(_nextCommit);
             
@@ -109,6 +123,7 @@ namespace Avalonia.Rendering.Composition
                         writer.WriteObject(job);
                     writer.WriteObject(ServerCompositor.RenderThreadJobsEndMarker);
                 }
+                _pendingServerCompositorJobs.Clear();
             }
             
             batch.CommittedAt = Server.Clock.Elapsed;
@@ -138,34 +153,73 @@ namespace Avalonia.Rendering.Composition
             RequestCommitAsync();
         }
 
-        internal void InvokeBeforeNextCommit(Action<Task> action)
+        /// <summary>
+        /// Enqueues a callback to be called before the next scheduled commit.
+        /// If there is no scheduled commit it automatically schedules one
+        /// This is useful for updating your composition tree objects after binding
+        /// and layout passes have completed
+        /// </summary>
+        public void RequestCompositionUpdate(Action action)
         {
             Dispatcher.UIThread.VerifyAccess();
-            _invokeBeforeCommit.Enqueue(action);
+            _invokeBeforeCommitWrite.Enqueue(action);
             RequestCommitAsync();
         }
 
-        /// <summary>
-        /// Attempts to query for a feature from the platform render interface
-        /// </summary>
-        public ValueTask<object?> TryGetRenderInterfaceFeature(Type featureType)
+        internal void PostServerJob(Action job)
         {
-            var tcs = new TaskCompletionSource<object?>();
-            _pendingServerCompositorJobs.Add(() =>
+            Dispatcher.UIThread.VerifyAccess();
+            _pendingServerCompositorJobs.Add(job);
+            RequestCommitAsync();
+        }
+
+        internal Task InvokeServerJobAsync(Action job) =>
+            InvokeServerJobAsync<object?>(() =>
+            {
+                job();
+                return null;
+            });
+
+        internal Task<T> InvokeServerJobAsync<T>(Func<T> job)
+        {
+            var tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
+            PostServerJob(() =>
             {
                 try
                 {
-                    using (Server.RenderInterface.EnsureCurrent())
-                    {
-                        tcs.TrySetResult(Server.RenderInterface.Value.TryGetFeature(featureType));
-                    }
+                    tcs.SetResult(job());
                 }
                 catch (Exception e)
                 {
                     tcs.TrySetException(e);
                 }
             });
-            return new ValueTask<object?>(tcs.Task);
+            return tcs.Task;
         }
+
+        /// <summary>
+        /// Attempts to query for a feature from the platform render interface
+        /// </summary>
+        public ValueTask<object?> TryGetRenderInterfaceFeature(Type featureType) =>
+            new(InvokeServerJobAsync(() =>
+            {
+                using (Server.RenderInterface.EnsureCurrent())
+                {
+                    return Server.RenderInterface.Value.TryGetFeature(featureType);
+                }
+            }));
+
+        public ValueTask<ICompositionGpuInterop?> TryGetCompositionGpuInterop() =>
+            new(InvokeServerJobAsync<ICompositionGpuInterop?>(() =>
+            {
+                using (Server.RenderInterface.EnsureCurrent())
+                {
+                    var feature = Server.RenderInterface.Value
+                        .TryGetFeature<IExternalObjectsRenderInterfaceContextFeature>();
+                    if (feature == null)
+                        return null;
+                    return new CompositionInterop(this, feature);
+                }
+            }));
     }
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
index aae1fcb90e..05488a558f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
@@ -159,7 +159,7 @@ internal class CompositionDrawingContext : IDrawingContextImpl, IDrawingContextW
     public object? GetFeature(Type t) => null;
 
     /// <inheritdoc/>
-    public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+    public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
     {
         var next = NextDrawAs<GlyphRunNode>();
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
index e6bbba6ec0..c58beebe7f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
@@ -86,7 +86,7 @@ internal class CompositorDrawingContextProxy : IDrawingContextImpl, IDrawingCont
         _impl.DrawEllipse(brush, pen, rect);
     }
 
-    public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+    public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
     {
         _impl.DrawGlyphRun(foreground, glyphRun);
     }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
index 18cb7a6308..ebab39cee8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
@@ -32,7 +32,7 @@ internal class FpsCounter
         {
             var s = new string((char)c, 1);
             var glyph = typeface.GetGlyph((uint)(s[0]));
-            _runs[c - FirstChar] = new GlyphRun(typeface, 18, s.ToArray(), new ushort[] { glyph });
+            _runs[c - FirstChar] = new GlyphRun(typeface, 18, s.AsMemory(), new ushort[] { glyph });
         }
     }
 
@@ -72,7 +72,7 @@ internal class FpsCounter
         {
             var run = _runs[ch - FirstChar];
             context.Transform = Matrix.CreateTranslation(offset, 0);
-            context.DrawGlyphRun(Brushes.White, run);
+            context.DrawGlyphRun(Brushes.White, run.PlatformImpl);
             offset += run.Size.Width;
         }
     }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
new file mode 100644
index 0000000000..9c6c78c1ad
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Runtime.ExceptionServices;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Rendering.Composition.Server;
+
+internal class ServerCompositionDrawingSurface : ServerCompositionSurface, IDisposable
+{
+    private IRef<IBitmapImpl>? _bitmap;
+    private IPlatformRenderInterfaceContext? _createdWithContext;
+    public override IRef<IBitmapImpl>? Bitmap
+    {
+        get
+        {
+            // Failsafe to avoid consuming an image imported with a different context
+            if (Compositor.RenderInterface.Value != _createdWithContext)
+                return null;
+            return _bitmap;
+        }
+    }
+
+    public ServerCompositionDrawingSurface(ServerCompositor compositor) : base(compositor)
+    {
+    }
+
+    void PerformSanityChecks(CompositionImportedGpuImage image)
+    {
+        // Failsafe to avoid consuming an image imported with a different context
+        if (!image.IsUsable)
+            throw new PlatformGraphicsContextLostException();
+
+        // This should never happen, but check for it anyway to avoid a deadlock
+        if (!image.ImportCompeted.IsCompleted)
+            throw new InvalidOperationException("The import operation is not completed yet");
+
+        // Rethrow the import here exception
+        if (image.ImportCompeted.IsFaulted)
+            image.ImportCompeted.GetAwaiter().GetResult();
+    }
+
+    void Update(IBitmapImpl newImage, IPlatformRenderInterfaceContext context)
+    {
+        _bitmap?.Dispose();
+        _bitmap = RefCountable.Create(newImage);
+        _createdWithContext = context;
+        Changed?.Invoke();
+    }
+
+    public void UpdateWithAutomaticSync(CompositionImportedGpuImage image)
+    {
+        PerformSanityChecks(image);
+        Update(image.Image.SnapshotWithAutomaticSync(), image.Context);
+    }
+    
+    public void UpdateWithKeyedMutex(CompositionImportedGpuImage image, uint acquireIndex, uint releaseIndex)
+    {
+        PerformSanityChecks(image);
+        Update(image.Image.SnapshotWithKeyedMutex(acquireIndex, releaseIndex), image.Context);
+    }
+
+    public void UpdateWithSemaphores(CompositionImportedGpuImage image, CompositionImportedGpuSemaphore wait, CompositionImportedGpuSemaphore signal)
+    {
+        PerformSanityChecks(image);
+        if (!wait.IsUsable || !signal.IsUsable)
+            throw new PlatformGraphicsContextLostException();
+        Update(image.Image.SnapshotWithSemaphores(wait.Semaphore, signal.Semaphore), image.Context);
+    }
+
+    public void Dispose()
+    {
+        _bitmap?.Dispose();
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
index 32a99fa187..88f10ba642 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
@@ -1,11 +1,18 @@
 // Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
+using System;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
 namespace Avalonia.Rendering.Composition.Server
 {
-    internal abstract class ServerCompositionSurface : ServerObject
+    internal abstract partial class ServerCompositionSurface : ServerObject
     {
         protected ServerCompositionSurface(ServerCompositor compositor) : base(compositor)
         {
         }
+        
+        public abstract IRef<IBitmapImpl>? Bitmap { get; }
+        public Action? Changed { get; set; }
     }
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs
new file mode 100644
index 0000000000..c75ae8e631
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs
@@ -0,0 +1,48 @@
+using Avalonia.Utilities;
+
+namespace Avalonia.Rendering.Composition.Server;
+
+internal partial class ServerCompositionSurfaceVisual
+{
+    protected override void RenderCore(CompositorDrawingContextProxy canvas, Rect currentTransformedClip)
+    {
+        if (Surface == null)
+            return;
+        if (Surface.Bitmap == null)
+            return;
+        var bmp = Surface.Bitmap.Item;
+
+        //TODO: add a way to always render the whole bitmap instead of just assuming 96 DPI
+        canvas.DrawBitmap(Surface.Bitmap, 1, new Rect(bmp.PixelSize.ToSize(1)), new Rect(
+            new Size(Size.X, Size.Y)));
+    }
+
+
+    private void OnSurfaceInvalidated() => ValuesInvalidated();
+
+    protected override void OnAttachedToRoot(ServerCompositionTarget target)
+    {
+        if (Surface != null)
+            Surface.Changed += OnSurfaceInvalidated;
+        base.OnAttachedToRoot(target);
+    }
+
+    protected override void OnDetachedFromRoot(ServerCompositionTarget target)
+    {
+        if (Surface != null)
+            Surface.Changed -= OnSurfaceInvalidated;
+        base.OnDetachedFromRoot(target);
+    }
+
+    partial void OnSurfaceChanged()
+    {
+        if (Surface != null)
+            Surface.Changed += OnSurfaceInvalidated;
+    }
+
+    partial void OnSurfaceChanging()
+    {
+        if (Surface != null)
+            Surface.Changed -= OnSurfaceInvalidated;
+    }
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
index e7405995f5..0492997200 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
@@ -22,7 +22,8 @@ namespace Avalonia.Rendering.Composition.Server
     {
         private readonly IRenderLoop _renderLoop;
 
-        private readonly Queue<Batch> _batches = new Queue<Batch>(); 
+        private readonly Queue<Batch> _batches = new Queue<Batch>();
+        private readonly Queue<Action> _receivedJobQueue = new();
         public long LastBatchId { get; private set; }
         public Stopwatch Clock { get; } = Stopwatch.StartNew();
         public TimeSpan ServerNow { get; private set; }
@@ -75,7 +76,7 @@ namespace Avalonia.Rendering.Composition.Server
                         var readObject = stream.ReadObject();
                         if (readObject == RenderThreadJobsStartMarker)
                         {
-                            ReadAndExecuteJobs(stream);
+                            ReadServerJobs(stream);
                             continue;
                         }
                         
@@ -97,21 +98,24 @@ namespace Avalonia.Rendering.Composition.Server
             }
         }
 
-        void ReadAndExecuteJobs(BatchStreamReader reader)
+        void ReadServerJobs(BatchStreamReader reader)
         {
             object? readObject;
             while ((readObject = reader.ReadObject()) != RenderThreadJobsEndMarker)
-            {
-                var job = (Action)readObject!;
+                _receivedJobQueue.Enqueue((Action)readObject!);
+        }
+
+        void ExecuteServerJobs()
+        {
+            while(_receivedJobQueue.Count > 0)
                 try
                 {
-                    job();
+                    _receivedJobQueue.Dequeue()();
                 }
                 catch
                 {
                     // Ignore
                 }
-            }
         }
 
         void CompletePendingBatches()
@@ -160,6 +164,7 @@ namespace Avalonia.Rendering.Composition.Server
             try
             {
                 RenderInterface.EnsureValidBackendContext();
+                ExecuteServerJobs();
                 foreach (var t in _activeTargets)
                     t.Render();
             }
diff --git a/src/Avalonia.Base/Rendering/PlatformRenderInterfaceContextManager.cs b/src/Avalonia.Base/Rendering/PlatformRenderInterfaceContextManager.cs
index 261a39fa09..c13bcfda96 100644
--- a/src/Avalonia.Base/Rendering/PlatformRenderInterfaceContextManager.cs
+++ b/src/Avalonia.Base/Rendering/PlatformRenderInterfaceContextManager.cs
@@ -50,6 +50,8 @@ public class PlatformRenderInterfaceContextManager
         }
     }
 
+    internal IPlatformGraphicsContext? GpuContext => _gpuContext?.Value;
+
     public IDisposable EnsureCurrent()
     {
         EnsureValidBackendContext();
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index d6766fa9b8..b1d8301557 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -206,7 +206,7 @@ namespace Avalonia.Rendering.SceneGraph
         public object? GetFeature(Type t) => null;
 
         /// <inheritdoc/>
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
         {
             var next = NextDrawAs<GlyphRunNode>();
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
index 1d85e95835..a2d914bdd7 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
@@ -1,6 +1,7 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Rendering.SceneGraph
 {
@@ -19,13 +20,13 @@ namespace Avalonia.Rendering.SceneGraph
         public GlyphRunNode(
             Matrix transform,
             IBrush foreground,
-            GlyphRun glyphRun,
+            IRef<IGlyphRunImpl> glyphRun,
             IDisposable? aux = null)
-            : base(new Rect(glyphRun.Size), transform, aux)
+            : base(new Rect(glyphRun.Item.Size), transform, aux)
         {
             Transform = transform;
             Foreground = foreground.ToImmutable();
-            GlyphRun = glyphRun;
+            GlyphRun = glyphRun.Clone();
         }
 
         /// <summary>
@@ -41,7 +42,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <summary>
         /// Gets the glyph run to draw.
         /// </summary>
-        public GlyphRun GlyphRun { get; }
+        public IRef<IGlyphRunImpl> GlyphRun { get; }
 
         /// <inheritdoc/>
         public override void Render(IDrawingContextImpl context)
@@ -61,14 +62,19 @@ namespace Avalonia.Rendering.SceneGraph
         /// The properties of the other draw operation are passed in as arguments to prevent
         /// allocation of a not-yet-constructed draw operation object.
         /// </remarks>
-        internal bool Equals(Matrix transform, IBrush foreground, GlyphRun glyphRun)
+        internal bool Equals(Matrix transform, IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
         {
             return transform == Transform &&
                    Equals(foreground, Foreground) &&
-                   Equals(glyphRun, GlyphRun);
+                   Equals(glyphRun.Item, GlyphRun.Item);
         }
 
         /// <inheritdoc/>
         public override bool HitTest(Point p) => Bounds.ContainsExclusive(p);
+
+        public override void Dispose()
+        {
+            GlyphRun?.Dispose();
+        }
     }
 }
diff --git a/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs b/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
index 73840376fe..cac4d1693a 100644
--- a/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
+++ b/src/Avalonia.Base/Rendering/SceneInvalidatedEventArgs.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Rendering
         /// </summary>
         /// <param name="root">The render root that has been updated.</param>
         /// <param name="dirtyRect">The updated area.</param>
-        internal SceneInvalidatedEventArgs(
+        public SceneInvalidatedEventArgs(
             IRenderRoot root,
             Rect dirtyRect)
         {
diff --git a/src/Avalonia.Base/Rendering/SwapchainBase.cs b/src/Avalonia.Base/Rendering/SwapchainBase.cs
new file mode 100644
index 0000000000..5d0bba2341
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/SwapchainBase.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Reactive;
+using Avalonia.Rendering.Composition;
+
+namespace Avalonia.Rendering;
+
+/// <summary>
+/// A helper class for composition-backed swapchains, should not be a public API yet
+/// </summary>
+abstract class SwapchainBase<TImage> : IAsyncDisposable where TImage : class, ISwapchainImage
+{
+    protected ICompositionGpuInterop Interop { get; }
+    protected CompositionDrawingSurface Target { get; }
+    private List<TImage> _pendingImages = new();
+
+    public SwapchainBase(ICompositionGpuInterop interop, CompositionDrawingSurface target)
+    {
+        Interop = interop;
+        Target = target;
+    }
+
+    static bool IsBroken(TImage image) => image.LastPresent?.IsFaulted == true;
+    static bool IsReady(TImage image) => image.LastPresent == null || image.LastPresent.Status == TaskStatus.RanToCompletion;
+
+    TImage? CleanupAndFindNextImage(PixelSize size)
+    {
+        TImage? firstFound = null;
+        var foundMultiple = false;
+        
+        for (var c = _pendingImages.Count - 1; c > -1; c--)
+        {
+            var image = _pendingImages[c];
+            var ready = IsReady(image);
+            var matches = image.Size == size;
+            if (IsBroken(image) || (!matches && ready))
+            {
+                image.DisposeAsync();
+                _pendingImages.RemoveAt(c);
+            }
+
+            if (matches && ready)
+            {
+                if (firstFound == null)
+                    firstFound = image;
+                else
+                    foundMultiple = true;
+            }
+
+        }
+
+        // We are making sure that there was at least one image of the same size in flight
+        // Otherwise we might encounter UI thread lockups
+        return foundMultiple ? firstFound : null;
+    }
+
+    protected abstract TImage CreateImage(PixelSize size);
+
+    protected IDisposable BeginDrawCore(PixelSize size, out TImage image)
+    {
+        var img = CleanupAndFindNextImage(size) ?? CreateImage(size);
+        
+        img.BeginDraw();
+        _pendingImages.Remove(img);
+        image = img;
+        return Disposable.Create(() =>
+        {
+            img.Present();
+            _pendingImages.Add(img);
+        });
+    }
+    
+    public async ValueTask DisposeAsync()
+    {
+        foreach (var img in _pendingImages)
+            await img.DisposeAsync();
+    }
+}
+
+
+interface ISwapchainImage : IAsyncDisposable
+{
+    PixelSize Size { get; }
+    Task? LastPresent { get; }
+    void BeginDraw();
+    void Present();
+}
diff --git a/src/Avalonia.Base/StyledProperty.cs b/src/Avalonia.Base/StyledProperty.cs
index 019ed09c20..79d1b9202d 100644
--- a/src/Avalonia.Base/StyledProperty.cs
+++ b/src/Avalonia.Base/StyledProperty.cs
@@ -1,14 +1,18 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Data;
+using Avalonia.PropertyStore;
+using Avalonia.Utilities;
 
 namespace Avalonia
 {
     /// <summary>
     /// A styled avalonia property.
     /// </summary>
-    public class StyledProperty<TValue> : StyledPropertyBase<TValue>
+    public class StyledProperty<TValue> : AvaloniaProperty<TValue>, IStyledPropertyAccessor
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="StyledPropertyBase{T}"/> class.
+        /// Initializes a new instance of the <see cref="StyledProperty{T}"/> class.
         /// </summary>
         /// <param name="name">The name of the property.</param>
         /// <param name="ownerType">The type of the class that registers the property.</param>
@@ -23,20 +27,30 @@ namespace Avalonia
             bool inherits = false,
             Func<TValue, bool>? validate = null,
             Action<AvaloniaObject, bool>? notifying = null)
-            : base(name, ownerType, metadata, inherits, validate, notifying)
+                : base(name, ownerType, metadata, notifying)
         {
+            Inherits = inherits;
+            ValidateValue = validate;
+            HasCoercion |= metadata.CoerceValue != null;
+
+            if (validate?.Invoke(metadata.DefaultValue) == false)
+            {
+                throw new ArgumentException(
+                    $"'{metadata.DefaultValue}' is not a valid default value for '{name}'.");
+            }
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="StyledPropertyBase{T}"/> class.
+        /// Gets the value validation callback for the property.
         /// </summary>
-        /// <param name="source">The property to add the owner to.</param>
-        /// <param name="ownerType">The type of the class that registers the property.</param>
-        internal StyledProperty(StyledPropertyBase<TValue> source, Type ownerType)
-            : base(source, ownerType)
-        {
-        }
-        
+        public Func<TValue, bool>? ValidateValue { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this property has any value coercion callbacks defined
+        /// in its metadata.
+        /// </summary>
+        internal bool HasCoercion { get; private set; }
+
         /// <summary>
         /// Registers the property on another type.
         /// </summary>
@@ -47,5 +61,177 @@ namespace Avalonia
             AvaloniaPropertyRegistry.Instance.Register(typeof(TOwner), this);
             return this;
         }
+
+        public TValue CoerceValue(AvaloniaObject instance, TValue baseValue)
+        {
+            var metadata = GetMetadata(instance.GetType());
+
+            if (metadata.CoerceValue != null)
+            {
+                return metadata.CoerceValue.Invoke(instance, baseValue);
+            }
+
+            return baseValue;
+        }
+
+        /// <summary>
+        /// Gets the default value for the property on the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>The default value.</returns>
+        public TValue GetDefaultValue(Type type)
+        {
+            return GetMetadata(type).DefaultValue;
+        }
+
+        /// <summary>
+        /// Gets the property metadata for the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>
+        /// The property metadata.
+        /// </returns>
+        public new StyledPropertyMetadata<TValue> GetMetadata(Type type)
+        {
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+            return (StyledPropertyMetadata<TValue>)base.GetMetadata(type);
+        }
+
+        /// <summary>
+        /// Overrides the default value for the property on the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="defaultValue">The default value.</param>
+        public void OverrideDefaultValue<T>(TValue defaultValue) where T : AvaloniaObject
+        {
+            OverrideDefaultValue(typeof(T), defaultValue);
+        }
+
+        /// <summary>
+        /// Overrides the default value for the property on the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="defaultValue">The default value.</param>
+        public void OverrideDefaultValue(Type type, TValue defaultValue)
+        {
+            OverrideMetadata(type, new StyledPropertyMetadata<TValue>(defaultValue));
+        }
+
+        /// <summary>
+        /// Overrides the metadata for the property on the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="metadata">The metadata.</param>
+        public void OverrideMetadata<T>(StyledPropertyMetadata<TValue> metadata) where T : AvaloniaObject
+        {
+            base.OverrideMetadata(typeof(T), metadata);
+        }
+
+        /// <summary>
+        /// Overrides the metadata for the property on the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="metadata">The metadata.</param>
+        public void OverrideMetadata(Type type, StyledPropertyMetadata<TValue> metadata)
+        {
+            if (ValidateValue != null)
+            {
+                if (!ValidateValue(metadata.DefaultValue))
+                {
+                    throw new ArgumentException(
+                        $"'{metadata.DefaultValue}' is not a valid default value for '{Name}'.");
+                }
+            }
+
+            HasCoercion |= metadata.CoerceValue != null;
+
+            base.OverrideMetadata(type, metadata);
+        }
+
+        /// <summary>
+        /// Gets the string representation of the property.
+        /// </summary>
+        /// <returns>The property's string representation.</returns>
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        /// <inheritdoc/>
+        object? IStyledPropertyAccessor.GetDefaultValue(Type type) => GetDefaultBoxedValue(type);
+
+        bool IStyledPropertyAccessor.ValidateValue(object? value)
+        {
+            if (value is null && !typeof(TValue).IsValueType)
+                return ValidateValue?.Invoke(default!) ?? true;
+            if (value is TValue typed)
+                return ValidateValue?.Invoke(typed) ?? true;
+            return false;
+        }
+
+        internal override EffectiveValue CreateEffectiveValue(AvaloniaObject o)
+        {
+            return new EffectiveValue<TValue>(o, this);
+        }
+
+        /// <inheritdoc/>
+        internal override void RouteClearValue(AvaloniaObject o)
+        {
+            o.ClearValue<TValue>(this);
+        }
+
+        /// <inheritdoc/>
+        internal override object? RouteGetValue(AvaloniaObject o)
+        {
+            return o.GetValue<TValue>(this);
+        }
+
+        /// <inheritdoc/>
+        internal override object? RouteGetBaseValue(AvaloniaObject o)
+        {
+            var value = o.GetBaseValue<TValue>(this);
+            return value.HasValue ? value.Value : AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        internal override IDisposable? RouteSetValue(
+            AvaloniaObject target,
+            object? value,
+            BindingPriority priority)
+        {
+            if (value == BindingOperations.DoNothing)
+            {
+                return null;
+            }
+            else if (value == UnsetValue)
+            {
+                target.ClearValue(this);
+                return null;
+            }
+            else if (TypeUtilities.TryConvertImplicit(PropertyType, value, out var converted))
+            {
+                return target.SetValue<TValue>(this, (TValue)converted!, priority);
+            }
+            else
+            {
+                var type = value?.GetType().FullName ?? "(null)";
+                throw new ArgumentException($"Invalid value for Property '{Name}': '{value}' ({type})");
+            }
+        }
+
+        internal override IDisposable RouteBind(
+            AvaloniaObject target,
+            IObservable<object?> source,
+            BindingPriority priority)
+        {
+            return target.Bind<TValue>(this, source, priority);
+        }
+
+        private object? GetDefaultBoxedValue(Type type)
+        {
+            _ = type ?? throw new ArgumentNullException(nameof(type));
+            return GetMetadata(type).DefaultValue;
+        }
     }
 }
diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
deleted file mode 100644
index a281a7b7f6..0000000000
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using Avalonia.Data;
-using Avalonia.PropertyStore;
-using Avalonia.Reactive;
-using Avalonia.Styling;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Base class for styled properties.
-    /// </summary>
-    public abstract class StyledPropertyBase<TValue> : AvaloniaProperty<TValue>, IStyledPropertyAccessor
-    {
-        private readonly bool _inherits;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyledPropertyBase{T}"/> class.
-        /// </summary>
-        /// <param name="name">The name of the property.</param>
-        /// <param name="ownerType">The type of the class that registers the property.</param>
-        /// <param name="metadata">The property metadata.</param>
-        /// <param name="inherits">Whether the property inherits its value.</param>
-        /// <param name="validate">A value validation callback.</param>
-        /// <param name="notifying">A <see cref="AvaloniaProperty.Notifying"/> callback.</param>
-        protected StyledPropertyBase(
-            string name,
-            Type ownerType,            
-            StyledPropertyMetadata<TValue> metadata,
-            bool inherits = false,
-            Func<TValue, bool>? validate = null,
-            Action<AvaloniaObject, bool>? notifying = null)
-                : base(name, ownerType, metadata, notifying)
-        {
-            _inherits = inherits;
-            ValidateValue = validate;
-            HasCoercion |= metadata.CoerceValue != null;
-
-            if (validate?.Invoke(metadata.DefaultValue) == false)
-            {
-                throw new ArgumentException(
-                    $"'{metadata.DefaultValue}' is not a valid default value for '{name}'.");
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyledPropertyBase{T}"/> class.
-        /// </summary>
-        /// <param name="source">The property to add the owner to.</param>
-        /// <param name="ownerType">The type of the class that registers the property.</param>
-        protected StyledPropertyBase(StyledPropertyBase<TValue> source, Type ownerType)
-            : base(source, ownerType, null)
-        {
-            _inherits = source.Inherits;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the property inherits its value.
-        /// </summary>
-        /// <value>
-        /// A value indicating whether the property inherits its value.
-        /// </value>
-        public override bool Inherits => _inherits;
-
-        /// <summary>
-        /// Gets the value validation callback for the property.
-        /// </summary>
-        public Func<TValue, bool>? ValidateValue { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this property has any value coercion callbacks defined
-        /// in its metadata.
-        /// </summary>
-        internal bool HasCoercion { get; private set; }
-
-        public TValue CoerceValue(AvaloniaObject instance, TValue baseValue)
-        {
-            var metadata = GetMetadata(instance.GetType());
-
-            if (metadata.CoerceValue != null)
-            {
-                return metadata.CoerceValue.Invoke(instance, baseValue);
-            }
-
-            return baseValue;
-        }
-
-        /// <summary>
-        /// Gets the default value for the property on the specified type.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns>The default value.</returns>
-        public TValue GetDefaultValue(Type type)
-        {
-            return GetMetadata(type).DefaultValue;
-        }
-
-        /// <summary>
-        /// Gets the property metadata for the specified type.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns>
-        /// The property metadata.
-        /// </returns>
-        public new StyledPropertyMetadata<TValue> GetMetadata(Type type)
-        {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-            return (StyledPropertyMetadata<TValue>)base.GetMetadata(type);
-        }
-
-        /// <summary>
-        /// Overrides the default value for the property on the specified type.
-        /// </summary>
-        /// <typeparam name="T">The type.</typeparam>
-        /// <param name="defaultValue">The default value.</param>
-        public void OverrideDefaultValue<T>(TValue defaultValue) where T : AvaloniaObject
-        {
-            OverrideDefaultValue(typeof(T), defaultValue);
-        }
-
-        /// <summary>
-        /// Overrides the default value for the property on the specified type.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <param name="defaultValue">The default value.</param>
-        public void OverrideDefaultValue(Type type, TValue defaultValue)
-        {
-            OverrideMetadata(type, new StyledPropertyMetadata<TValue>(defaultValue));
-        }
-
-        /// <summary>
-        /// Overrides the metadata for the property on the specified type.
-        /// </summary>
-        /// <typeparam name="T">The type.</typeparam>
-        /// <param name="metadata">The metadata.</param>
-        public void OverrideMetadata<T>(StyledPropertyMetadata<TValue> metadata) where T : AvaloniaObject
-        {
-            base.OverrideMetadata(typeof(T), metadata);
-        }
-
-        /// <summary>
-        /// Overrides the metadata for the property on the specified type.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <param name="metadata">The metadata.</param>
-        public void OverrideMetadata(Type type, StyledPropertyMetadata<TValue> metadata)
-        {
-            if (ValidateValue != null)
-            {
-                if (!ValidateValue(metadata.DefaultValue))
-                {
-                    throw new ArgumentException(
-                        $"'{metadata.DefaultValue}' is not a valid default value for '{Name}'.");
-                }
-            }
-
-            HasCoercion |= metadata.CoerceValue != null;
-
-            base.OverrideMetadata(type, metadata);
-        }
-
-        /// <summary>
-        /// Gets the string representation of the property.
-        /// </summary>
-        /// <returns>The property's string representation.</returns>
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        /// <inheritdoc/>
-        object? IStyledPropertyAccessor.GetDefaultValue(Type type) => GetDefaultBoxedValue(type);
-
-        bool IStyledPropertyAccessor.ValidateValue(object? value)
-        {
-            if (value is null && !typeof(TValue).IsValueType)
-                return ValidateValue?.Invoke(default!) ?? true;
-            if (value is TValue typed)
-                return ValidateValue?.Invoke(typed) ?? true;
-            return false;
-        }
-
-        internal override EffectiveValue CreateEffectiveValue(AvaloniaObject o)
-        {
-            return new EffectiveValue<TValue>(o, this);
-        }
-
-        /// <inheritdoc/>
-        internal override void RouteClearValue(AvaloniaObject o)
-        {
-            o.ClearValue<TValue>(this);
-        }
-
-        /// <inheritdoc/>
-        internal override object? RouteGetValue(AvaloniaObject o)
-        {
-            return o.GetValue<TValue>(this);
-        }
-
-        /// <inheritdoc/>
-        internal override object? RouteGetBaseValue(AvaloniaObject o)
-        {
-            var value = o.GetBaseValue<TValue>(this);
-            return value.HasValue ? value.Value : AvaloniaProperty.UnsetValue;
-        }
-
-        /// <inheritdoc/>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
-        internal override IDisposable? RouteSetValue(
-            AvaloniaObject target,
-            object? value,
-            BindingPriority priority)
-        {
-            if (value == BindingOperations.DoNothing)
-            {
-                return null;
-            }
-            else if (value == UnsetValue)
-            {
-                target.ClearValue(this);
-                return null;
-            }
-            else if (TypeUtilities.TryConvertImplicit(PropertyType, value, out var converted))
-            {
-                return target.SetValue<TValue>(this, (TValue)converted!, priority);
-            }
-            else
-            {
-                var type = value?.GetType().FullName ?? "(null)";
-                throw new ArgumentException($"Invalid value for Property '{Name}': '{value}' ({type})");
-            }
-        }
-
-        internal override IDisposable RouteBind(
-            AvaloniaObject target,
-            IObservable<object?> source,
-            BindingPriority priority)
-        {
-            return target.Bind<TValue>(this, source, priority);
-        }
-
-        private object? GetDefaultBoxedValue(Type type)
-        {
-            _ = type ?? throw new ArgumentNullException(nameof(type));
-            return GetMetadata(type).DefaultValue;
-        }
-    }
-}
diff --git a/src/Avalonia.Base/Styling/PropertySetterInstance.cs b/src/Avalonia.Base/Styling/PropertySetterInstance.cs
index 68a9b8aafe..af5540ecf0 100644
--- a/src/Avalonia.Base/Styling/PropertySetterInstance.cs
+++ b/src/Avalonia.Base/Styling/PropertySetterInstance.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Styling
         ISetterInstance
     {
         private readonly StyledElement _target;
-        private readonly StyledPropertyBase<T>? _styledProperty;
+        private readonly StyledProperty<T>? _styledProperty;
         private readonly DirectPropertyBase<T>? _directProperty;
         private readonly T _value;
         private IDisposable? _subscription;
@@ -22,7 +22,7 @@ namespace Avalonia.Styling
 
         public PropertySetterInstance(
             StyledElement target,
-            StyledPropertyBase<T> property,
+            StyledProperty<T> property,
             T value)
         {
             _target = target;
diff --git a/src/Avalonia.Base/Styling/Setter.cs b/src/Avalonia.Base/Styling/Setter.cs
index b7b44a7dfe..093597c6a0 100644
--- a/src/Avalonia.Base/Styling/Setter.cs
+++ b/src/Avalonia.Base/Styling/Setter.cs
@@ -109,7 +109,7 @@ namespace Avalonia.Styling
 
                 if (mode == BindingMode.OneWay || mode == BindingMode.TwoWay)
                 {
-                    return new PropertySetterBindingInstance(target, instance, Property, mode, i.Observable!);
+                    return new PropertySetterBindingInstance(target, instance, Property, mode, i.Source);
                 }
 
                 throw new NotSupportedException();
diff --git a/src/Avalonia.Base/Utilities/ArrayBuilder.cs b/src/Avalonia.Base/Utilities/ArrayBuilder.cs
index e6b67bd383..bbbcc39ecc 100644
--- a/src/Avalonia.Base/Utilities/ArrayBuilder.cs
+++ b/src/Avalonia.Base/Utilities/ArrayBuilder.cs
@@ -3,7 +3,6 @@
 // Ported from: https://github.com/SixLabors/Fonts/
 
 using System;
-using System.Buffers;
 using System.Runtime.CompilerServices;
 
 namespace Avalonia.Utilities
@@ -12,14 +11,13 @@ namespace Avalonia.Utilities
     /// A helper type for avoiding allocations while building arrays.
     /// </summary>
     /// <typeparam name="T">The type of item contained in the array.</typeparam>
-    internal struct ArrayBuilder<T> : IDisposable
-        where T : struct
+    internal struct ArrayBuilder<T>
     {
         private const int DefaultCapacity = 4;
         private const int MaxCoreClrArrayLength = 0x7FeFFFFF;
 
         // Starts out null, initialized on first Add.
-        private T[] _data;
+        private T[]? _data;
         private int _size;
 
         /// <summary>
@@ -49,6 +47,12 @@ namespace Avalonia.Utilities
             }
         }
 
+        /// <summary>
+        /// Gets the current capacity of the array.
+        /// </summary>
+        public int Capacity
+            => _data?.Length ?? 0;
+
         /// <summary>
         /// Returns a reference to specified element of the array.
         /// </summary>
@@ -116,14 +120,44 @@ namespace Avalonia.Utilities
             return slice;
         }
 
+        /// <summary>
+        /// Appends an item.
+        /// </summary>
+        /// <param name="value">The item to append.</param>
+        public void AddItem(T value)
+        {
+            var index = Length++;
+            _data![index] = value;
+        }
+
         /// <summary>
         /// Clears the array.
         /// Allocated memory is left intact for future usage.
         /// </summary>
         public void Clear()
         {
-            // No need to actually clear since we're not allowing reference types.
+#if NET6_0_OR_GREATER
+            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+            {
+                ClearArray();
+            }
+            else
+            {
+                _size = 0;
+            }
+#else
+            ClearArray();
+#endif
+        }
+
+        private void ClearArray()
+        {
+            var size = _size;
             _size = 0;
+            if (size > 0)
+            {
+                Array.Clear(_data!, 0, size);
+            }
         }
 
         private void EnsureCapacity(int min)
@@ -136,7 +170,7 @@ namespace Avalonia.Utilities
             }
 
             // Same expansion algorithm as List<T>.
-            var newCapacity = length == 0 ? DefaultCapacity : length * 2;
+            var newCapacity = length == 0 ? DefaultCapacity : (uint)length * 2u;
 
             if (newCapacity > MaxCoreClrArrayLength)
             {
@@ -145,15 +179,14 @@ namespace Avalonia.Utilities
 
             if (newCapacity < min)
             {
-                newCapacity = min;
+                newCapacity = (uint)min;
             }
             
-            var array = ArrayPool<T>.Shared.Rent(newCapacity);
+            var array = new T[newCapacity];
 
             if (_size > 0)
             {
                 Array.Copy(_data!, array, _size);
-                ArrayPool<T>.Shared.Return(_data!);
             }
 
             _data = array;
@@ -182,13 +215,12 @@ namespace Avalonia.Utilities
         /// <returns>The <see cref="ArraySlice{T}"/>.</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ArraySlice<T> AsSlice(int start, int length) => new ArraySlice<T>(_data!, start, length);
-        
-        public void Dispose()
-        {
-            if (_data != null)
-            {
-                ArrayPool<T>.Shared.Return(_data);
-            }
-        }
+
+        /// <summary>
+        /// Returns the current state of the array as a span.
+        /// </summary>
+        /// <returns>The <see cref="Span{T}"/>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Span<T> AsSpan() => _data.AsSpan(0, _size);
     }
 }
diff --git a/src/Avalonia.Base/Utilities/ArraySlice.cs b/src/Avalonia.Base/Utilities/ArraySlice.cs
index b70088a907..17e75f2f95 100644
--- a/src/Avalonia.Base/Utilities/ArraySlice.cs
+++ b/src/Avalonia.Base/Utilities/ArraySlice.cs
@@ -3,7 +3,6 @@
 // Ported from: https://github.com/SixLabors/Fonts/
 
 using System;
-using System.Buffers;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -18,7 +17,6 @@ namespace Avalonia.Utilities
     /// </summary>
     /// <typeparam name="T">The type of item contained in the slice.</typeparam>
     internal readonly struct ArraySlice<T> : IReadOnlyList<T>
-        where T : struct
     {
         /// <summary>
         /// Gets an empty <see cref="ArraySlice{T}"/>
@@ -186,13 +184,6 @@ namespace Avalonia.Utilities
 
         /// <inheritdoc/>
         int IReadOnlyCollection<T>.Count => Length;
-
-        public void ReturnRent()
-        {
-            if (_data != null)
-            {
-                ArrayPool<T>.Shared.Return(_data);
-            }
-        }
     }
 }
+
diff --git a/src/Avalonia.Base/Utilities/BidiDictionary.cs b/src/Avalonia.Base/Utilities/BidiDictionary.cs
index 654fbc9807..01af53ad89 100644
--- a/src/Avalonia.Base/Utilities/BidiDictionary.cs
+++ b/src/Avalonia.Base/Utilities/BidiDictionary.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Media.TextFormatting;
 
 namespace Avalonia.Utilities
 {
@@ -9,32 +11,27 @@ namespace Avalonia.Utilities
     /// <typeparam name="T2">Value type</typeparam>
     internal sealed class BidiDictionary<T1, T2> where T1 : notnull where T2 : notnull
     {
-        public Dictionary<T1, T2> Forward { get; } = new Dictionary<T1, T2>();
+        private Dictionary<T1, T2> _forward = new();
+        private Dictionary<T2, T1> _reverse = new();
 
-        public Dictionary<T2, T1> Reverse { get; } = new Dictionary<T2, T1>();
-
-        public void Clear()
+        public void ClearThenResetIfTooLarge()
         {
-            Forward.Clear();
-            Reverse.Clear();
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _forward);
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref _reverse);
         }
 
         public void Add(T1 key, T2 value)
         {
-            Forward.Add(key, value);
-            Reverse.Add(value, key);
+            _forward.Add(key, value);
+            _reverse.Add(value, key);
         }
 
-#pragma warning disable CS8601
-        public bool TryGetValue(T1 key, out T2 value) => Forward.TryGetValue(key, out value);
-#pragma warning restore CS8601
+        public bool TryGetValue(T1 key, [MaybeNullWhen(false)] out T2 value) => _forward.TryGetValue(key, out value);
 
-#pragma warning disable CS8601
-        public bool TryGetKey(T2 value, out T1 key) => Reverse.TryGetValue(value, out key);
-#pragma warning restore CS8601
+        public bool TryGetKey(T2 value, [MaybeNullWhen(false)] out T1 key) => _reverse.TryGetValue(value, out key);
 
-        public bool ContainsKey(T1 key) => Forward.ContainsKey(key);
+        public bool ContainsKey(T1 key) => _forward.ContainsKey(key);
 
-        public bool ContainsValue(T2 value) => Reverse.ContainsKey(value);
+        public bool ContainsValue(T2 value) => _reverse.ContainsKey(value);
     }
 }
diff --git a/src/Avalonia.Base/Utilities/BinarySearchExtension.cs b/src/Avalonia.Base/Utilities/BinarySearchExtension.cs
index b7060d2e21..defc9b1639 100644
--- a/src/Avalonia.Base/Utilities/BinarySearchExtension.cs
+++ b/src/Avalonia.Base/Utilities/BinarySearchExtension.cs
@@ -14,7 +14,6 @@
 // under the License.
 // Copied from: https://github.com/toptensoftware/RichTextKit
 
-using System;
 using System.Collections.Generic;
 
 namespace Avalonia.Utilities
@@ -39,7 +38,7 @@ namespace Avalonia.Utilities
         /// <param name="value">The value to search for</param>
         /// <param name="comparer">The comparer</param>
         /// <returns>The index of the found item; otherwise the bitwise complement of the index of the next larger item</returns>
-        public static int BinarySearch<T>(this IReadOnlyList<T> list, T value, IComparer<T> comparer) where T : IComparable
+        public static int BinarySearch<T>(this IReadOnlyList<T> list, T value, IComparer<T> comparer)
         {
             return list.BinarySearch(0, list.Count, value, comparer);
         }
diff --git a/src/Avalonia.Base/composition-schema.xml b/src/Avalonia.Base/composition-schema.xml
index 6dfcb2e74d..a0dbf238dc 100644
--- a/src/Avalonia.Base/composition-schema.xml
+++ b/src/Avalonia.Base/composition-schema.xml
@@ -7,6 +7,8 @@
     
     <Manual Name="Avalonia.Platform.IGeometryImpl" Passthrough="true"/>
     <Manual Name="Avalonia.Media.IBrush" Passthrough="true"/>
+    <Manual Name="CompositionSurface" />
+    <Manual Name="CompositionDrawingSurface" />
     <Object Name="CompositionVisual" Abstract="true">
         <Property Name="Root" Type="CompositionTarget?" InternalSet="true" />
         <Property Name="Parent" Type="CompositionVisual?" InternalSet="true"  />
@@ -30,6 +32,9 @@
     <Object Name="CompositionSolidColorVisual" Inherits="CompositionContainerVisual">
         <Property Name="Color" Type="Avalonia.Media.Color" Animated="true" />
     </Object>
+    <Object Name="CompositionSurfaceVisual" Inherits="CompositionContainerVisual">
+        <Property Name="Surface" Type="CompositionSurface?" />
+    </Object>
     <List Name="CompositionVisualCollection" ItemType="CompositionVisual" CustomCtor="true"/>
     <Object Name="CompositionTarget" CustomServerCtor="true">
         <Property Name="Root" Type="CompositionVisual?"/>
@@ -46,4 +51,4 @@
     <KeyFrameAnimation Type="Vector3"/>
     <KeyFrameAnimation Type="Vector4"/>
     <KeyFrameAnimation Type="Quaternion"/>
-</NComposition>
\ No newline at end of file
+</NComposition>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 2ccf20d460..8f52b059f1 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -245,11 +245,12 @@
                                        VerticalAlignment="Center" />
                           </Border>
                           <!-- Color updated in code-behind -->
+                          <!-- Max length must include an optional '#' prefix (#FFFFFFFF) -->
                           <TextBox x:Name="PART_HexTextBox"
                                    Grid.Column="1"
                                    AutomationProperties.Name="Hexadecimal Color"
                                    Height="32"
-                                   MaxLength="8"
+                                   MaxLength="9"
                                    HorizontalAlignment="Stretch"
                                    CornerRadius="0,4,4,0" />
                         </Grid>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 286ca71bc2..fab5415bfb 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -494,11 +494,12 @@
                                  VerticalAlignment="Center" />
                     </Border>
                     <!-- Color updated in code-behind -->
+                    <!-- Max length must include an optional '#' prefix (#FFFFFFFF) -->
                     <TextBox x:Name="PART_HexTextBox"
                              Grid.Column="1"
                              AutomationProperties.Name="Hexadecimal Color"
                              Height="32"
-                             MaxLength="8"
+                             MaxLength="9"
                              HorizontalAlignment="Stretch"
                              CornerRadius="0,4,4,0" />
                   </Grid>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
index b82d36a288..d44902dd70 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
@@ -245,11 +245,12 @@
                                        VerticalAlignment="Center" />
                           </Border>
                           <!-- Color updated in code-behind -->
+                          <!-- Max length must include an optional '#' prefix (#FFFFFFFF) -->
                           <TextBox x:Name="PART_HexTextBox"
                                    Grid.Column="1"
                                    AutomationProperties.Name="Hexadecimal Color"
                                    Height="32"
-                                   MaxLength="8"
+                                   MaxLength="9"
                                    HorizontalAlignment="Stretch"
                                    CornerRadius="0,0,0,0" />
                         </Grid>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
index 556099f56b..0ce6dd5e04 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
@@ -456,11 +456,12 @@
                                  VerticalAlignment="Center" />
                     </Border>
                     <!-- Color updated in code-behind -->
+                    <!-- Max length must include an optional '#' prefix (#FFFFFFFF) -->
                     <TextBox x:Name="PART_HexTextBox"
                              Grid.Column="1"
                              AutomationProperties.Name="Hexadecimal Color"
                              Height="32"
-                             MaxLength="8"
+                             MaxLength="9"
                              HorizontalAlignment="Stretch"
                              CornerRadius="0,0,0,0" />
                   </Grid>
diff --git a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
index e859a6e725..8f532b9803 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
@@ -7,6 +7,7 @@ using Avalonia.Data;
 using System;
 using Avalonia.Controls.Utils;
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Reactive;
 
 namespace Avalonia.Controls
 {
@@ -111,9 +112,9 @@ namespace Avalonia.Controls
 
             if (result != null)
             {
-                if(result.Subject != null)
+                if(result.Source is IAvaloniaSubject<object> subject)
                 {
-                    var bindingHelper = new CellEditBinding(result.Subject);
+                    var bindingHelper = new CellEditBinding(subject);
                     var instanceBinding = new InstancedBinding(bindingHelper.InternalSubject, result.Mode, result.Priority); 
 
                     BindingOperations.Apply(target, property, instanceBinding, null);
diff --git a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
index ac23873e6a..85f139a6a3 100644
--- a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Automation.Peers
 
             if (Owner.Parent is SelectingItemsControl parent)
             {
-                var index = parent.ItemContainerGenerator.IndexFromContainer(Owner);
+                var index = parent.IndexFromContainer(Owner);
 
                 if (index != -1)
                     parent.SelectedIndex = index;
@@ -50,7 +50,7 @@ namespace Avalonia.Automation.Peers
             if (Owner.Parent is ItemsControl parent &&
                 parent.GetValue(ListBox.SelectionProperty) is ISelectionModel selectionModel)
             {
-                var index = parent.ItemContainerGenerator.IndexFromContainer(Owner);
+                var index = parent.IndexFromContainer(Owner);
 
                 if (index != -1)
                     selectionModel.Select(index);
diff --git a/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs
index 7ae0ba7244..11480fcb34 100644
--- a/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Automation.Peers
 
                 foreach (var i in selection.SelectedIndexes)
                 {
-                    var container = owner.ItemContainerGenerator.ContainerFromIndex(i);
+                    var container = owner.ContainerFromIndex(i);
 
                     if (container is Control c && c.IsAttachedToVisualTree)
                     {
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index aeaf94d728..b7a298bb16 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -399,12 +399,12 @@ namespace Avalonia.Controls
             var selectedIndex = SelectedIndex;
             if (IsDropDownOpen && selectedIndex != -1)
             {
-                var container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
+                var container = ContainerFromIndex(selectedIndex);
 
                 if (container == null && SelectedIndex != -1)
                 {
                     ScrollIntoView(Selection.SelectedIndex);
-                    container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
+                    container = ContainerFromIndex(selectedIndex);
                 }
 
                 if (container != null && CanFocus(container))
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
index 97fda68051..b028a8f007 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -3,6 +3,7 @@ using Avalonia.Collections;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Metadata;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -27,6 +28,12 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
                 x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
 
+        /// <summary>
+        /// Defines the <see cref="ItemContainerTheme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ItemContainerThemeProperty =
+            ItemsControl.ItemContainerThemeProperty.AddOwner<MenuFlyout>();
+
         public Classes FlyoutPresenterClasses => _classes ??= new Classes();
 
         /// <summary>
@@ -48,6 +55,15 @@ namespace Avalonia.Controls
             set => SetAndRaise(ItemTemplateProperty, ref _itemTemplate, value);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for each item.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme
+        {
+            get { return GetValue(ItemContainerThemeProperty); }
+            set { SetValue(ItemContainerThemeProperty, value); }
+        }
+
         private Classes? _classes;
         private IEnumerable? _items;
         private IDataTemplate? _itemTemplate;
@@ -57,7 +73,8 @@ namespace Avalonia.Controls
             return new MenuFlyoutPresenter
             {
                 [!ItemsControl.ItemsProperty] = this[!ItemsProperty],
-                [!ItemsControl.ItemTemplateProperty] = this[!ItemTemplateProperty]
+                [!ItemsControl.ItemTemplateProperty] = this[!ItemTemplateProperty],
+                [!ItemsControl.ItemContainerThemeProperty] = this[!ItemContainerThemeProperty],
             };
         }
 
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 7aca21b42e..594d7da2fb 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -1,5 +1,4 @@
 using System;
-using Avalonia.Controls.Generators;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index d19a04eb21..db49da85e8 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -12,6 +12,8 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.Styling;
@@ -23,7 +25,7 @@ namespace Avalonia.Controls
     /// Displays a collection of items.
     /// </summary>
     [PseudoClasses(":empty", ":singleitem")]
-    public class ItemsControl : TemplatedControl, IChildIndexProvider
+    public class ItemsControl : TemplatedControl, IChildIndexProvider, IScrollSnapPointsInfo
     {
         /// <summary>
         /// The default value for the <see cref="ItemsPanel"/> property.
@@ -72,6 +74,18 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly StyledProperty<IBinding?> DisplayMemberBindingProperty =
             AvaloniaProperty.Register<ItemsControl, IBinding?>(nameof(DisplayMemberBinding));
+        
+        /// <summary>
+        /// Defines the <see cref="AreHorizontalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreHorizontalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<ItemsControl, bool>(nameof(AreHorizontalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="AreVerticalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreVerticalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<ItemsControl, bool>(nameof(AreVerticalSnapPointsRegular));
 
         /// <summary>
         /// Gets or sets the <see cref="IBinding"/> to use for binding to the display member of each item.
@@ -91,6 +105,8 @@ namespace Avalonia.Controls
         private IDataTemplate? _displayMemberItemTemplate;
         private Tuple<int, Control>? _containerBeingPrepared;
         private ScrollViewer? _scrollViewer;
+        private ItemsPresenter? _itemsPresenter;
+        private IScrollSnapPointsInfo? _scrolSnapPointInfo;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemsControl"/> class.
@@ -203,6 +219,63 @@ namespace Avalonia.Controls
             remove => _childIndexChanged -= value;
         }
 
+
+        public event EventHandler<RoutedEventArgs> HorizontalSnapPointsChanged
+        {
+            add
+            {
+                if (_itemsPresenter != null)
+                {
+                    _itemsPresenter.HorizontalSnapPointsChanged += value;
+                }
+            }
+
+            remove
+            {
+                if (_itemsPresenter != null)
+                {
+                    _itemsPresenter.HorizontalSnapPointsChanged -= value;
+                }
+            }
+        }
+
+        public event EventHandler<RoutedEventArgs> VerticalSnapPointsChanged
+        {
+            add
+            {
+                if (_itemsPresenter != null)
+                {
+                    _itemsPresenter.VerticalSnapPointsChanged += value;
+                }
+            }
+
+            remove
+            {
+                if (_itemsPresenter != null)
+                {
+                    _itemsPresenter.VerticalSnapPointsChanged -= value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the horizontal snap points for the <see cref="ItemsControl"/> are equidistant from each other.
+        /// </summary>
+        public bool AreHorizontalSnapPointsRegular
+        {
+            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the vertical snap points for the <see cref="ItemsControl"/> are equidistant from each other.
+        /// </summary>
+        public bool AreVerticalSnapPointsRegular
+        {
+            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+        }
+
         /// <summary>
         /// Returns the container for the item at the specified index.
         /// </summary>
@@ -255,7 +328,6 @@ namespace Avalonia.Controls
         /// </summary>
         public IEnumerable<Control> GetRealizedContainers() => Presenter?.GetRealizedContainers() ?? Array.Empty<Control>();
 
-
         /// <summary>
         /// Creates or a container that can be used to display an item.
         /// </summary>
@@ -355,6 +427,9 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
             _scrollViewer = e.NameScope.Find<ScrollViewer>("PART_ScrollViewer");
+            _itemsPresenter = e.NameScope.Find<ItemsPresenter>("PART_ItemsPresenter");
+
+            _scrolSnapPointInfo = _itemsPresenter as IScrollSnapPointsInfo;
         }
 
         /// <summary>
@@ -671,5 +746,17 @@ namespace Avalonia.Controls
             count = ItemsView.Count;
             return true;
         }
+
+        public IReadOnlyList<double> GetIrregularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment)
+        {
+            return _itemsPresenter?.GetIrregularSnapPoints(orientation, snapPointsAlignment) ?? new List<double>();
+        }
+
+        public double GetRegularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment, out double offset)
+        {
+            offset = 0;
+
+            return _itemsPresenter?.GetRegularSnapPoints(orientation, snapPointsAlignment, out offset) ?? 0;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/MenuBase.cs b/src/Avalonia.Controls/MenuBase.cs
index 1918964bc8..da7a36fa73 100644
--- a/src/Avalonia.Controls/MenuBase.cs
+++ b/src/Avalonia.Controls/MenuBase.cs
@@ -84,13 +84,13 @@ namespace Avalonia.Controls
             {
                 var index = SelectedIndex;
                 return (index != -1) ?
-                    (IMenuItem?)ItemContainerGenerator.ContainerFromIndex(index) :
+                    (IMenuItem?)ContainerFromIndex(index) :
                     null;
             }
             set
             {
                 SelectedIndex = value is Control c ?
-                    ItemContainerGenerator.IndexFromContainer(c) : -1;
+                    IndexFromContainer(c) : -1;
             }
         }
 
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index aeee6f8410..5588bde7c0 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -13,7 +13,6 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -319,12 +318,12 @@ namespace Avalonia.Controls
             {
                 var index = SelectedIndex;
                 return (index != -1) ?
-                    (IMenuItem?)ItemContainerGenerator.ContainerFromIndex(index) :
+                    (IMenuItem?)ContainerFromIndex(index) :
                     null;
             }
             set
             {
-                SelectedIndex = value is Control c ? ItemContainerGenerator.IndexFromContainer(c) : -1;
+                SelectedIndex = value is Control c ? IndexFromContainer(c) : -1;
             }
         }
 
@@ -691,7 +690,7 @@ namespace Avalonia.Controls
 
             if (selected != -1)
             {
-                var container = ItemContainerGenerator?.ContainerFromIndex(selected);
+                var container = ContainerFromIndex(selected);
                 container?.Focus();
             }
         }
diff --git a/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs b/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs
index 2775c53803..a8a266e378 100644
--- a/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs
+++ b/src/Avalonia.Controls/Platform/Dialogs/SystemDialogImpl.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
 
 #nullable enable
 
@@ -26,9 +27,7 @@ namespace Avalonia.Controls.Platform
 
                 var files = await filePicker.OpenFilePickerAsync(options);
                 return files
-                    .Select(file => file.TryGetUri(out var fullPath)
-                        ? fullPath.LocalPath
-                        : file.Name)
+                    .Select(file => file.TryGetFullPath() ?? file.Name)
                     .ToArray();
             }
             else if (dialog is SaveFileDialog saveDialog)
@@ -47,9 +46,7 @@ namespace Avalonia.Controls.Platform
                     return null;
                 }
 
-                var filePath = file.TryGetUri(out var fullPath)
-                    ? fullPath.LocalPath
-                    : file.Name;
+                var filePath = file.TryGetFullPath() ?? file.Name;
                 return new[] { filePath };
             }
             return null;
@@ -67,7 +64,7 @@ namespace Avalonia.Controls.Platform
 
             var folders = await filePicker.OpenFolderPickerAsync(options);
             return folders
-                .Select(f => f.TryGetUri(out var uri) ? uri.LocalPath : null)
+                .Select(folder => folder.TryGetFullPath() ?? folder.Name)
                 .FirstOrDefault(u => u is not null);
         }
     }
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
index e0252feed5..8594b584fa 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
@@ -3,13 +3,15 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls.Presenters
 {
     /// <summary>
     /// Presents items inside an <see cref="Avalonia.Controls.ItemsControl"/>.
     /// </summary>
-    public class ItemsPresenter : Control, ILogicalScrollable
+    public class ItemsPresenter : Control, ILogicalScrollable, IScrollSnapPointsInfo
     {
         /// <summary>
         /// Defines the <see cref="ItemsPanel"/> property.
@@ -19,8 +21,37 @@ namespace Avalonia.Controls.Presenters
 
         private PanelContainerGenerator? _generator;
         private ILogicalScrollable? _logicalScrollable;
+        private IScrollSnapPointsInfo? _scrollSnapPointsInfo;
         private EventHandler? _scrollInvalidated;
 
+        /// <summary>
+        /// Defines the <see cref="AreHorizontalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreHorizontalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<ItemsControl, bool>(nameof(AreHorizontalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="AreVerticalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreVerticalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<ItemsControl, bool>(nameof(AreVerticalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> HorizontalSnapPointsChangedEvent =
+            RoutedEvent.Register<StackPanel, RoutedEventArgs>(
+                nameof(HorizontalSnapPointsChanged),
+                RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> VerticalSnapPointsChangedEvent =
+            RoutedEvent.Register<StackPanel, RoutedEventArgs>(
+                nameof(VerticalSnapPointsChanged),
+                RoutingStrategies.Bubble);
+
         static ItemsPresenter()
         {
             KeyboardNavigation.TabNavigationProperty.OverrideDefaultValue(
@@ -83,12 +114,48 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <summary>
+        /// Occurs when the measurements for horizontal snap points change.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? HorizontalSnapPointsChanged
+        {
+            add => AddHandler(HorizontalSnapPointsChangedEvent, value);
+            remove => RemoveHandler(HorizontalSnapPointsChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs when the measurements for vertical snap points change.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? VerticalSnapPointsChanged
+        {
+            add => AddHandler(VerticalSnapPointsChangedEvent, value);
+            remove => RemoveHandler(VerticalSnapPointsChangedEvent, value);
+        }
+
         bool ILogicalScrollable.IsLogicalScrollEnabled => _logicalScrollable?.IsLogicalScrollEnabled ?? false;
         Size ILogicalScrollable.ScrollSize => _logicalScrollable?.ScrollSize ?? default;
         Size ILogicalScrollable.PageScrollSize => _logicalScrollable?.PageScrollSize ?? default;
         Size IScrollable.Extent => _logicalScrollable?.Extent ?? default;
         Size IScrollable.Viewport => _logicalScrollable?.Viewport ?? default;
 
+        /// <summary>
+        /// Gets or sets whether the horizontal snap points for the <see cref="ItemsControl"/> are equidistant from each other.
+        /// </summary>
+        public bool AreHorizontalSnapPointsRegular
+        {
+            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the vertical snap points for the <see cref="ItemsControl"/> are equidistant from each other.
+        /// </summary>
+        public bool AreVerticalSnapPointsRegular
+        {
+            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+        }
+
         public override sealed void ApplyTemplate()
         {
             if (Panel is null && ItemsControl is not null)
@@ -100,14 +167,36 @@ namespace Avalonia.Controls.Presenters
 
                 Panel = ItemsPanel.Build();
                 Panel.SetValue(TemplatedParentProperty, TemplatedParent);
+                _scrollSnapPointsInfo = Panel as IScrollSnapPointsInfo;
                 LogicalChildren.Add(Panel);
                 VisualChildren.Add(Panel);
 
+                if (_scrollSnapPointsInfo != null)
+                {
+                    _scrollSnapPointsInfo.AreVerticalSnapPointsRegular = AreVerticalSnapPointsRegular;
+                    _scrollSnapPointsInfo.AreHorizontalSnapPointsRegular = AreHorizontalSnapPointsRegular;
+                }
+
                 if (Panel is VirtualizingPanel v)
                     v.Attach(ItemsControl);
                 else
                     CreateSimplePanelGenerator();
 
+                if(Panel is IScrollSnapPointsInfo scrollSnapPointsInfo)
+                {
+                    scrollSnapPointsInfo.VerticalSnapPointsChanged += (s, e) =>
+                    {
+                        e.RoutedEvent = VerticalSnapPointsChangedEvent;
+                        RaiseEvent(e);
+                    };
+
+                    scrollSnapPointsInfo.HorizontalSnapPointsChanged += (s, e) =>
+                    {
+                        e.RoutedEvent = HorizontalSnapPointsChangedEvent;
+                        RaiseEvent(e);
+                    };
+                }
+
                 _logicalScrollable = Panel as ILogicalScrollable;
 
                 if (_logicalScrollable is not null)
@@ -151,6 +240,16 @@ namespace Avalonia.Controls.Presenters
                 ResetState();
                 InvalidateMeasure();
             }
+            else if(change.Property == AreHorizontalSnapPointsRegularProperty)
+            {
+                if (_scrollSnapPointsInfo != null)
+                    _scrollSnapPointsInfo.AreHorizontalSnapPointsRegular = AreHorizontalSnapPointsRegular;
+            }
+            else if (change.Property == AreVerticalSnapPointsRegularProperty)
+            {
+                if (_scrollSnapPointsInfo != null)
+                    _scrollSnapPointsInfo.AreVerticalSnapPointsRegular = AreVerticalSnapPointsRegular;
+            }
         }
 
         internal void Refresh()
@@ -204,5 +303,27 @@ namespace Avalonia.Controls.Presenters
         }
 
         private void OnLogicalScrollInvalidated(object? sender, EventArgs e) => _scrollInvalidated?.Invoke(this, e);
+
+        public IReadOnlyList<double> GetIrregularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment)
+        {
+            if(Panel is IScrollSnapPointsInfo scrollSnapPointsInfo)
+            {
+                return scrollSnapPointsInfo.GetIrregularSnapPoints(orientation, snapPointsAlignment);
+            }
+
+            return new List<double>();
+        }
+
+        public double GetRegularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment, out double offset)
+        {
+            if (Panel is IScrollSnapPointsInfo scrollSnapPointsInfo)
+            {
+                return scrollSnapPointsInfo.GetRegularSnapPoints(orientation, snapPointsAlignment, out offset);
+            }
+
+            offset = 0;
+
+            return 0;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 0cfe4bada1..7d5b5e1490 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Reactive;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
@@ -14,6 +15,7 @@ namespace Avalonia.Controls.Presenters
     public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable, IScrollAnchorProvider
     {
         private const double EdgeDetectionTolerance = 0.1;
+        private const int ProximityPoints = 10;
 
         /// <summary>
         /// Defines the <see cref="CanHorizontallyScroll"/> property.
@@ -57,6 +59,30 @@ namespace Avalonia.Controls.Presenters
                 o => o.Viewport,
                 (o, v) => o.Viewport = v);
 
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsType"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SnapPointsType> HorizontalSnapPointsTypeProperty =
+            ScrollViewer.HorizontalSnapPointsTypeProperty.AddOwner<ScrollContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsType"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SnapPointsType> VerticalSnapPointsTypeProperty =
+           ScrollViewer.VerticalSnapPointsTypeProperty.AddOwner<ScrollContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SnapPointsAlignment> HorizontalSnapPointsAlignmentProperty =
+            ScrollViewer.HorizontalSnapPointsAlignmentProperty.AddOwner<ScrollContentPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SnapPointsAlignment> VerticalSnapPointsAlignmentProperty =
+            ScrollViewer.VerticalSnapPointsAlignmentProperty.AddOwner<ScrollContentPresenter>();
+
         /// <summary>
         /// Defines the <see cref="IsScrollChainingEnabled"/> property.
         /// </summary>
@@ -71,10 +97,19 @@ namespace Avalonia.Controls.Presenters
         private IDisposable? _logicalScrollSubscription;
         private Size _viewport;
         private Dictionary<int, Vector>? _activeLogicalGestureScrolls;
+        private Dictionary<int, Vector>? _scrollGestureSnapPoints;
         private List<Control>? _anchorCandidates;
         private Control? _anchorElement;
         private Rect _anchorElementBounds;
         private bool _isAnchorElementDirty;
+        private bool _areVerticalSnapPointsRegular;
+        private bool _areHorizontalSnapPointsRegular;
+        private IReadOnlyList<double>? _horizontalSnapPoints;
+        private double _horizontalSnapPoint;
+        private IReadOnlyList<double>? _verticalSnapPoints;
+        private double _verticalSnapPoint;
+        private double _verticalSnapPointOffset;
+        private double _horizontalSnapPointOffset;
 
         /// <summary>
         /// Initializes static members of the <see cref="ScrollContentPresenter"/> class.
@@ -93,6 +128,7 @@ namespace Avalonia.Controls.Presenters
             AddHandler(RequestBringIntoViewEvent, BringIntoViewRequested);
             AddHandler(Gestures.ScrollGestureEvent, OnScrollGesture);
             AddHandler(Gestures.ScrollGestureEndedEvent, OnScrollGestureEnded);
+            AddHandler(Gestures.ScrollGestureInertiaStartingEvent, OnScrollGestureInertiaStartingEnded);
 
             this.GetObservable(ChildProperty).Subscribe(UpdateScrollableSubscription);
         }
@@ -142,6 +178,42 @@ namespace Avalonia.Controls.Presenters
             private set { SetAndRaise(ViewportProperty, ref _viewport, value); }
         }
 
+        /// <summary>
+        /// Gets or sets how scroll gesture reacts to the snap points along the horizontal axis.
+        /// </summary>
+        public SnapPointsType HorizontalSnapPointsType
+        {
+            get => GetValue(HorizontalSnapPointsTypeProperty);
+            set => SetValue(HorizontalSnapPointsTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how scroll gesture reacts to the snap points along the vertical axis.
+        /// </summary>
+        public SnapPointsType VerticalSnapPointsType
+        {
+            get => GetValue(VerticalSnapPointsTypeProperty);
+            set => SetValue(VerticalSnapPointsTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how the existing snap points are horizontally aligned versus the initial viewport.
+        /// </summary>
+        public SnapPointsAlignment HorizontalSnapPointsAlignment
+        {
+            get => GetValue(HorizontalSnapPointsAlignmentProperty);
+            set => SetValue(HorizontalSnapPointsAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how the existing snap points are vertically aligned versus the initial viewport.
+        /// </summary>
+        public SnapPointsAlignment VerticalSnapPointsAlignment
+        {
+            get => GetValue(VerticalSnapPointsAlignmentProperty); 
+            set => SetValue(VerticalSnapPointsAlignmentProperty, value);
+        }
+
         /// <summary>
         ///  Gets or sets if scroll chaining is enabled. The default value is true.
         /// </summary>
@@ -424,6 +496,25 @@ namespace Avalonia.Controls.Presenters
                 }
 
                 Vector newOffset = new Vector(x, y);
+
+                if (_scrollGestureSnapPoints?.TryGetValue(e.Id, out var snapPoint) == true)
+                {
+                    double xOffset = x;
+                    double yOffset = y;
+
+                    if (HorizontalSnapPointsType != SnapPointsType.None)
+                    {
+                        xOffset = delta.X < 0 ? Math.Max(snapPoint.X, newOffset.X) : Math.Min(snapPoint.X, newOffset.X);
+                    }
+
+                    if (VerticalSnapPointsType != SnapPointsType.None)
+                    {
+                        yOffset = delta.Y < 0 ? Math.Max(snapPoint.Y, newOffset.Y) : Math.Min(snapPoint.Y, newOffset.Y);
+                    }
+
+                    newOffset = new Vector(xOffset, yOffset);
+                }
+
                 bool offsetChanged = newOffset != Offset;
                 Offset = newOffset;
 
@@ -434,7 +525,65 @@ namespace Avalonia.Controls.Presenters
         }
 
         private void OnScrollGestureEnded(object? sender, ScrollGestureEndedEventArgs e)
-            => _activeLogicalGestureScrolls?.Remove(e.Id);
+        {
+            _activeLogicalGestureScrolls?.Remove(e.Id);
+            _scrollGestureSnapPoints?.Remove(e.Id);
+
+            Offset = SnapOffset(Offset);
+        }
+
+        private void OnScrollGestureInertiaStartingEnded(object? sender, ScrollGestureInertiaStartingEventArgs e)
+        {
+            if (Content is not IScrollSnapPointsInfo)
+                return;
+
+            if (_scrollGestureSnapPoints == null)
+                _scrollGestureSnapPoints = new Dictionary<int, Vector>();
+
+            var offset = Offset;
+
+            if (HorizontalSnapPointsType != SnapPointsType.None && VerticalSnapPointsType != SnapPointsType.None)
+            {
+                return;
+            }
+
+            double xDistance = 0;
+            double yDistance = 0;
+
+            if (HorizontalSnapPointsType != SnapPointsType.None)
+            {
+                xDistance = HorizontalSnapPointsType == SnapPointsType.Mandatory ? GetDistance(e.Inertia.X) : 0;
+            }
+
+            if (VerticalSnapPointsType != SnapPointsType.None)
+            {
+                yDistance = VerticalSnapPointsType == SnapPointsType.Mandatory ? GetDistance(e.Inertia.Y) : 0;
+            }
+
+            offset = new Vector(offset.X + xDistance, offset.Y + yDistance);
+
+            System.Diagnostics.Debug.WriteLine($"{offset}");
+
+            _scrollGestureSnapPoints.Add(e.Id, SnapOffset(offset));
+
+            double GetDistance(double speed)
+            {
+                var time = Math.Log(ScrollGestureRecognizer.InertialScrollSpeedEnd / Math.Abs(speed)) / Math.Log(ScrollGestureRecognizer.InertialResistance);
+
+                double timeElapsed = 0, distance = 0, step = 0;
+
+                while (timeElapsed <= time)
+                {
+                    double s = speed * Math.Pow(ScrollGestureRecognizer.InertialResistance, timeElapsed);
+                    distance += (s * step);
+
+                    timeElapsed += 0.016f;
+                    step = 0.016f;
+                }
+
+                return distance;
+            }
+        }
 
         /// <inheritdoc/>
         protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
@@ -458,6 +607,30 @@ namespace Avalonia.Controls.Presenters
                 if (Extent.Height > Viewport.Height)
                 {
                     double height = isLogical ? scrollable!.ScrollSize.Height : 50;
+                    if(VerticalSnapPointsType == SnapPointsType.MandatorySingle && Content is IScrollSnapPointsInfo)
+                    {
+                        if(_areVerticalSnapPointsRegular)
+                        {
+                            height = _verticalSnapPoint;
+                        }
+                        else if(_verticalSnapPoints != null)
+                        {
+                            double yOffset = Offset.Y;
+                            switch (VerticalSnapPointsAlignment)
+                            {
+                                case SnapPointsAlignment.Center:
+                                    yOffset += Viewport.Height / 2;
+                                    break;
+                                case SnapPointsAlignment.Far:
+                                    yOffset += Viewport.Height;
+                                    break;
+                            }
+
+                            var snapPoint = FindNearestSnapPoint(_verticalSnapPoints, yOffset, out var lowerSnapPoint);
+
+                            height = snapPoint - lowerSnapPoint;
+                        }
+                    }
                     y += -delta.Y * height;
                     y = Math.Max(y, 0);
                     y = Math.Min(y, Extent.Height - Viewport.Height);
@@ -466,12 +639,37 @@ namespace Avalonia.Controls.Presenters
                 if (Extent.Width > Viewport.Width)
                 {
                     double width = isLogical ? scrollable!.ScrollSize.Width : 50;
+                    if (HorizontalSnapPointsType == SnapPointsType.MandatorySingle && Content is IScrollSnapPointsInfo)
+                    {
+                        if (_areHorizontalSnapPointsRegular)
+                        {
+                            width = _horizontalSnapPoint;
+                        }
+                        else if(_horizontalSnapPoints != null)
+                        {
+                            double xOffset = Offset.X;
+                            switch (VerticalSnapPointsAlignment)
+                            {
+                                case SnapPointsAlignment.Center:
+                                    xOffset += Viewport.Width / 2;
+                                    break;
+                                case SnapPointsAlignment.Far:
+                                    xOffset += Viewport.Width;
+                                    break;
+                            }
+
+                            var snapPoint = FindNearestSnapPoint(_horizontalSnapPoints, xOffset, out var lowerSnapPoint);
+
+                            width = snapPoint - lowerSnapPoint;
+                        }
+                    }
                     x += -delta.X * width;
                     x = Math.Max(x, 0);
                     x = Math.Min(x, Extent.Width - Viewport.Width);
                 }
 
-                Vector newOffset = new Vector(x, y);
+                Vector newOffset = SnapOffset(new Vector(x, y));
+
                 bool offsetChanged = newOffset != Offset;
                 Offset = newOffset;
 
@@ -485,10 +683,36 @@ namespace Avalonia.Controls.Presenters
             {
                 InvalidateArrange();
             }
+            else if (change.Property == ContentProperty)
+            {
+                if (change.OldValue is IScrollSnapPointsInfo oldSnapPointsInfo)
+                {
+                    oldSnapPointsInfo.VerticalSnapPointsChanged -= ScrollSnapPointsInfoSnapPointsChanged;
+                    oldSnapPointsInfo.HorizontalSnapPointsChanged += ScrollSnapPointsInfoSnapPointsChanged;
+                }
+
+                if (Content is IScrollSnapPointsInfo scrollSnapPointsInfo)
+                {
+                    scrollSnapPointsInfo.VerticalSnapPointsChanged += ScrollSnapPointsInfoSnapPointsChanged;
+                    scrollSnapPointsInfo.HorizontalSnapPointsChanged += ScrollSnapPointsInfoSnapPointsChanged;
+                }
+
+                UpdateSnapPoints();
+            }
+            else if (change.Property == HorizontalSnapPointsAlignmentProperty ||
+                change.Property == VerticalSnapPointsAlignmentProperty)
+            {
+                UpdateSnapPoints();
+            }
 
             base.OnPropertyChanged(change);
         }
 
+        private void ScrollSnapPointsInfoSnapPointsChanged(object? sender, Interactivity.RoutedEventArgs e)
+        {
+            UpdateSnapPoints();
+        }
+
         private void BringIntoViewRequested(object? sender, RequestBringIntoViewEventArgs e)
         {
             if (e.TargetObject is not null)
@@ -635,5 +859,145 @@ namespace Avalonia.Controls.Presenters
             bounds = p.HasValue ? new Rect(p.Value, control.Bounds.Size) : default;
             return p.HasValue;
         }
+
+        private void UpdateSnapPoints()
+        {
+            if (Content is IScrollSnapPointsInfo scrollSnapPointsInfo)
+            {
+                _areVerticalSnapPointsRegular = scrollSnapPointsInfo.AreVerticalSnapPointsRegular;
+                _areHorizontalSnapPointsRegular = scrollSnapPointsInfo.AreHorizontalSnapPointsRegular;
+
+                if (!_areVerticalSnapPointsRegular)
+                {
+                    _verticalSnapPoints = scrollSnapPointsInfo.GetIrregularSnapPoints(Layout.Orientation.Vertical, VerticalSnapPointsAlignment);
+                }
+                else
+                {
+                    _verticalSnapPoints = new List<double>();
+                    _verticalSnapPoint = scrollSnapPointsInfo.GetRegularSnapPoints(Layout.Orientation.Vertical, VerticalSnapPointsAlignment, out _verticalSnapPointOffset);
+
+                }
+
+                if (!_areHorizontalSnapPointsRegular)
+                {
+                    _horizontalSnapPoints = scrollSnapPointsInfo.GetIrregularSnapPoints(Layout.Orientation.Horizontal, HorizontalSnapPointsAlignment);
+                }
+                else
+                {
+                    _horizontalSnapPoints = new List<double>();
+                    _horizontalSnapPoint = scrollSnapPointsInfo.GetRegularSnapPoints(Layout.Orientation.Vertical, VerticalSnapPointsAlignment, out _horizontalSnapPointOffset);
+                }
+            }
+            else
+            {
+                _horizontalSnapPoints = new List<double>();
+                _verticalSnapPoints = new List<double>();
+            }
+        }
+
+        private Vector SnapOffset(Vector offset)
+        {
+            if(Content is not IScrollSnapPointsInfo)
+                return offset;
+
+            var diff = GetAlignedDiff();
+
+            if (VerticalSnapPointsType != SnapPointsType.None)
+            {
+                offset = new Vector(offset.X, offset.Y + diff.Y);
+                double nearestSnapPoint = offset.Y;
+
+                if (_areVerticalSnapPointsRegular)
+                {
+                    var minSnapPoint = (int)(offset.Y / _verticalSnapPoint) * _verticalSnapPoint + _verticalSnapPointOffset;
+                    var maxSnapPoint = minSnapPoint + _verticalSnapPoint;
+                    var midPoint = (minSnapPoint + maxSnapPoint) / 2;
+
+                    nearestSnapPoint = offset.Y < midPoint ? minSnapPoint : maxSnapPoint;
+                }
+                else if (_verticalSnapPoints != null && _verticalSnapPoints.Count > 0)
+                {
+                    var higherSnapPoint = FindNearestSnapPoint(_verticalSnapPoints, offset.Y, out var lowerSnapPoint);
+                    var midPoint = (lowerSnapPoint + higherSnapPoint) / 2;
+
+                    nearestSnapPoint = offset.Y < midPoint ? lowerSnapPoint : higherSnapPoint;
+                }
+
+                offset = new Vector(offset.X, nearestSnapPoint - diff.Y);
+            }
+
+            if (HorizontalSnapPointsType != SnapPointsType.None)
+            {
+                offset = new Vector(offset.X + diff.X, offset.Y);
+                double nearestSnapPoint = offset.X;
+
+                if (_areHorizontalSnapPointsRegular)
+                {
+                    var minSnapPoint = (int)(offset.X / _horizontalSnapPoint) * _horizontalSnapPoint + _horizontalSnapPointOffset;
+                    var maxSnapPoint = minSnapPoint + _horizontalSnapPoint;
+                    var midPoint = (minSnapPoint + maxSnapPoint) / 2;
+
+                    nearestSnapPoint = offset.X < midPoint ? minSnapPoint : maxSnapPoint;
+                }
+                else if (_horizontalSnapPoints != null && _horizontalSnapPoints.Count > 0)
+                {
+                    var higherSnapPoint = FindNearestSnapPoint(_horizontalSnapPoints, offset.X, out var lowerSnapPoint);
+                    var midPoint = (lowerSnapPoint + higherSnapPoint) / 2;
+
+                    nearestSnapPoint = offset.X < midPoint ? lowerSnapPoint : higherSnapPoint;
+                }
+
+                offset = new Vector(nearestSnapPoint - diff.X, offset.Y);
+
+            }
+
+            Vector GetAlignedDiff()
+            {
+                var vector = offset;
+
+                switch (VerticalSnapPointsAlignment)
+                {
+                    case SnapPointsAlignment.Center:
+                        vector += new Vector(0, Viewport.Height / 2);
+                        break;
+                    case SnapPointsAlignment.Far:
+                        vector += new Vector(0, Viewport.Height);
+                        break;
+                }
+
+                switch (HorizontalSnapPointsAlignment)
+                {
+                    case SnapPointsAlignment.Center:
+                        vector += new Vector(Viewport.Width / 2, 0);
+                        break;
+                    case SnapPointsAlignment.Far:
+                        vector += new Vector(Viewport.Width, 0);
+                        break;
+                }                
+
+                return vector - offset;
+            }
+
+            return offset;
+        }
+
+        private static double FindNearestSnapPoint(IReadOnlyList<double> snapPoints, double value, out double lowerSnapPoint)
+        {
+            var point = snapPoints.BinarySearch(value, Comparer<double>.Default);
+
+            if (point < 0)
+            {
+                point = ~point;
+
+                lowerSnapPoint = snapPoints[Math.Max(0, point - 1)];
+            }
+            else
+            {
+                lowerSnapPoint = snapPoints[point];
+
+                point += 1;
+            }
+            return snapPoints[Math.Min(point, snapPoints.Count - 1)];
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/IScrollSnapPointsInfo.cs b/src/Avalonia.Controls/Primitives/IScrollSnapPointsInfo.cs
new file mode 100644
index 0000000000..7b33db0df2
--- /dev/null
+++ b/src/Avalonia.Controls/Primitives/IScrollSnapPointsInfo.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Describes snap point behavior for objects that contain and present items.
+    /// </summary>
+    public interface IScrollSnapPointsInfo
+    {
+        /// <summary>
+        /// Gets or sets a value that indicates whether the horizontal snap points for the container are equidistant from each other.
+        /// </summary>
+        bool AreHorizontalSnapPointsRegular { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether the vertical snap points for the container are equidistant from each other.
+        /// </summary>
+        bool AreVerticalSnapPointsRegular { get; set; }
+
+        /// <summary>
+        /// Returns the set of distances between irregular snap points for a specified orientation and alignment.
+        /// </summary>
+        /// <param name="orientation">The orientation for the desired snap point set.</param>
+        /// <param name="snapPointsAlignment">The alignment to use when applying the snap points.</param>
+        /// <returns>The read-only collection of snap point distances. Returns an empty collection when no snap points are present.</returns>
+        IReadOnlyList<double> GetIrregularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment);
+
+        /// <summary>
+        /// Gets the distance between regular snap points for a specified orientation and alignment.
+        /// </summary>
+        /// <param name="orientation">The orientation for the desired snap point set.</param>
+        /// <param name="snapPointsAlignment">The alignment to use when applying the snap points.</param>
+        /// <param name="offset">Out parameter. The offset of the first snap point.</param>
+        /// <returns>The distance between the equidistant snap points. Returns 0 when no snap points are present.</returns>
+        double GetRegularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment, out double offset);
+
+        /// <summary>
+        /// Occurs when the measurements for horizontal snap points change.
+        /// </summary>
+        event EventHandler<RoutedEventArgs> HorizontalSnapPointsChanged;
+
+        /// <summary>
+        /// Occurs when the measurements for vertical snap points change.
+        /// </summary>
+        event EventHandler<RoutedEventArgs> VerticalSnapPointsChanged;
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/SnapPointsAlignment.cs b/src/Avalonia.Controls/Primitives/SnapPointsAlignment.cs
new file mode 100644
index 0000000000..77b93c50a0
--- /dev/null
+++ b/src/Avalonia.Controls/Primitives/SnapPointsAlignment.cs
@@ -0,0 +1,23 @@
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Specify options for snap point alignment relative to an edge. Which edge depends on the orientation of the object where the alignment is applied
+    /// </summary>
+    public enum SnapPointsAlignment
+    {
+        /// <summary>
+        /// Use snap points grouped closer to the orientation edge.
+        /// </summary>
+        Near,
+
+        /// <summary>
+        /// Use snap points that are centered in the orientation.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// Use snap points grouped farther from the orientation edge.
+        /// </summary>
+        Far
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/SnapPointsType.cs b/src/Avalonia.Controls/Primitives/SnapPointsType.cs
new file mode 100644
index 0000000000..130fb85f77
--- /dev/null
+++ b/src/Avalonia.Controls/Primitives/SnapPointsType.cs
@@ -0,0 +1,23 @@
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Specify how panning snap points are processed for gesture input.
+    /// </summary>
+    public enum SnapPointsType
+    {
+        /// <summary>
+        /// No snapping behavior.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Content always stops at the snap point closest to where inertia would naturally stop along the direction of inertia.
+        /// </summary>
+        Mandatory,
+
+        /// <summary>
+        /// Content always stops at the snap point closest to the release point along the direction of inertia.
+        /// </summary>
+        MandatorySingle
+    }
+}
diff --git a/src/Avalonia.Controls/PullToRefresh/ScrollViewerIRefreshInfoProviderAdapter.cs b/src/Avalonia.Controls/PullToRefresh/ScrollViewerIRefreshInfoProviderAdapter.cs
index 844973bd28..4c1e0c2565 100644
--- a/src/Avalonia.Controls/PullToRefresh/ScrollViewerIRefreshInfoProviderAdapter.cs
+++ b/src/Avalonia.Controls/PullToRefresh/ScrollViewerIRefreshInfoProviderAdapter.cs
@@ -169,9 +169,9 @@ namespace Avalonia.Controls.PullToRefresh
                 visualizerComposition.ImplicitAnimations = animation;
             }
 
-            if(_scrollViewer != null && _scrollViewer.Content is Visual visual)
+            if(_scrollViewer != null)
             {
-                var scollContentComposition = ElementComposition.GetElementVisual(visual);
+                var scollContentComposition = ElementComposition.GetElementVisual(_scrollViewer);
 
                 if(scollContentComposition != null)
                 {
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index 503187e2d3..1c23919d0e 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -151,6 +151,34 @@ namespace Avalonia.Controls
                 o => o.VerticalScrollBarValue,
                 (o, v) => o.VerticalScrollBarValue = v);
 
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsType"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SnapPointsType> HorizontalSnapPointsTypeProperty =
+            AvaloniaProperty.Register<ScrollViewer, SnapPointsType>(
+                nameof(HorizontalSnapPointsType));
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsType"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SnapPointsType> VerticalSnapPointsTypeProperty =
+            AvaloniaProperty.Register<ScrollViewer, SnapPointsType>(
+                nameof(VerticalSnapPointsType));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsAlignment"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<SnapPointsAlignment> HorizontalSnapPointsAlignmentProperty =
+            AvaloniaProperty.RegisterAttached<ScrollViewer, Control, SnapPointsAlignment>(
+                nameof(HorizontalSnapPointsAlignment));
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsAlignment"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<SnapPointsAlignment> VerticalSnapPointsAlignmentProperty =
+            AvaloniaProperty.RegisterAttached<ScrollViewer, Control, SnapPointsAlignment>(
+                nameof(VerticalSnapPointsAlignment));
+
         /// <summary>
         /// Defines the VerticalScrollBarViewportSize property.
         /// </summary>
@@ -193,6 +221,14 @@ namespace Avalonia.Controls
                 nameof(IsScrollChainingEnabled),
                 defaultValue: true);
 
+        /// <summary>
+        /// Defines the <see cref="IsScrollInertiaEnabled"/> property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> IsScrollInertiaEnabledProperty =
+            AvaloniaProperty.RegisterAttached<ScrollViewer, Control, bool>(
+                nameof(IsScrollInertiaEnabled),
+                defaultValue: true);
+
         /// <summary>
         /// Defines the <see cref="ScrollChanged"/> event.
         /// </summary>
@@ -421,6 +457,42 @@ namespace Avalonia.Controls
             private set => SetAndRaise(ScrollBar.IsExpandedProperty, ref _isExpanded, value);
         }
 
+        /// <summary>
+        /// Gets or sets how scroll gesture reacts to the snap points along the horizontal axis.
+        /// </summary>
+        public SnapPointsType HorizontalSnapPointsType
+        {
+            get => GetValue(HorizontalSnapPointsTypeProperty);
+            set => SetValue(HorizontalSnapPointsTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how scroll gesture reacts to the snap points along the vertical axis.
+        /// </summary>
+        public SnapPointsType VerticalSnapPointsType
+        {
+            get => GetValue(VerticalSnapPointsTypeProperty);
+            set => SetValue(VerticalSnapPointsTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how the existing snap points are horizontally aligned versus the initial viewport.
+        /// </summary>
+        public SnapPointsAlignment HorizontalSnapPointsAlignment
+        {
+            get => GetValue(HorizontalSnapPointsAlignmentProperty); 
+            set => SetValue(HorizontalSnapPointsAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how the existing snap points are vertically aligned versus the initial viewport.
+        /// </summary>
+        public SnapPointsAlignment VerticalSnapPointsAlignment
+        {
+            get => GetValue(VerticalSnapPointsAlignmentProperty); 
+            set => SetValue(VerticalSnapPointsAlignmentProperty, value);
+        }
+
         /// <summary>
         /// Gets a value that indicates whether scrollbars can hide itself when user is not interacting with it.
         /// </summary>
@@ -444,6 +516,15 @@ namespace Avalonia.Controls
             set => SetValue(IsScrollChainingEnabledProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets whether scroll gestures should include inertia in their behavior and value.
+        /// </summary>
+        public bool IsScrollInertiaEnabled
+        {
+            get => GetValue(IsScrollInertiaEnabledProperty);
+            set => SetValue(IsScrollInertiaEnabledProperty, value);
+        }
+
         /// <summary>
         /// Scrolls the content up one line.
         /// </summary>
diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index 964a1055df..aa63ac975e 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -4,7 +4,11 @@
 // Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Layout;
 
 namespace Avalonia.Controls
@@ -12,7 +16,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A panel which lays out its children horizontally or vertically.
     /// </summary>
-    public class StackPanel : Panel, INavigableContainer
+    public class StackPanel : Panel, INavigableContainer, IScrollSnapPointsInfo
     {
         /// <summary>
         /// Defines the <see cref="Spacing"/> property.
@@ -26,6 +30,34 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Orientation> OrientationProperty =
             StackLayout.OrientationProperty.AddOwner<StackPanel>();
 
+        /// <summary>
+        /// Defines the <see cref="AreHorizontalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreHorizontalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<StackPanel, bool>(nameof(AreHorizontalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="AreVerticalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreVerticalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<StackPanel, bool>(nameof(AreVerticalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> HorizontalSnapPointsChangedEvent =
+            RoutedEvent.Register<StackPanel, RoutedEventArgs>(
+                nameof(HorizontalSnapPointsChanged),
+                RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> VerticalSnapPointsChangedEvent =
+            RoutedEvent.Register<StackPanel, RoutedEventArgs>(
+                nameof(VerticalSnapPointsChanged),
+                RoutingStrategies.Bubble);
+
         /// <summary>
         /// Initializes static members of the <see cref="StackPanel"/> class.
         /// </summary>
@@ -53,6 +85,42 @@ namespace Avalonia.Controls
             set { SetValue(OrientationProperty, value); }
         }
 
+        /// <summary>
+        /// Occurs when the measurements for horizontal snap points change.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? HorizontalSnapPointsChanged
+        {
+            add => AddHandler(HorizontalSnapPointsChangedEvent, value);
+            remove => RemoveHandler(HorizontalSnapPointsChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs when the measurements for vertical snap points change.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? VerticalSnapPointsChanged
+        {
+            add => AddHandler(VerticalSnapPointsChangedEvent, value);
+            remove => RemoveHandler(VerticalSnapPointsChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the horizontal snap points for the <see cref="StackPanel"/> are equidistant from each other.
+        /// </summary>
+        public bool AreHorizontalSnapPointsRegular
+        {
+            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the vertical snap points for the <see cref="StackPanel"/> are equidistant from each other.
+        /// </summary>
+        public bool AreVerticalSnapPointsRegular
+        {
+            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+        }
+
         /// <summary>
         /// Gets the next control in the specified direction.
         /// </summary>
@@ -274,6 +342,8 @@ namespace Avalonia.Controls
                 ArrangeChild(child, rcChild, finalSize, Orientation);
             }
 
+            RaiseEvent(new RoutedEventArgs(Orientation == Orientation.Horizontal ? HorizontalSnapPointsChangedEvent : VerticalSnapPointsChangedEvent));
+
             return finalSize;
         }
 
@@ -285,5 +355,124 @@ namespace Avalonia.Controls
         {
             child.Arrange(rect);
         }
+
+        /// <inheritdoc/>
+        public IReadOnlyList<double> GetIrregularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment)
+        {
+            var snapPoints = new List<double>();
+
+            switch (orientation)
+            {
+                case Orientation.Horizontal:
+                    if (AreHorizontalSnapPointsRegular)
+                        throw new InvalidOperationException();
+                    if (Orientation == Orientation.Horizontal)
+                    {
+                        foreach(var child in VisualChildren)
+                        {
+                            double snapPoint = 0;
+
+                            switch (snapPointsAlignment)
+                            {
+                                case SnapPointsAlignment.Near:
+                                    snapPoint = child.Bounds.Left;
+                                    break;
+                                case SnapPointsAlignment.Center:
+                                    snapPoint = child.Bounds.Center.X;
+                                    break;
+                                case SnapPointsAlignment.Far:
+                                    snapPoint = child.Bounds.Right;
+                                    break;
+                            }
+
+                            snapPoints.Add(snapPoint);
+                        }
+                    }
+                    break;
+                case Orientation.Vertical:
+                    if (AreVerticalSnapPointsRegular)
+                        throw new InvalidOperationException();
+                    if (Orientation == Orientation.Vertical)
+                    {
+                        foreach (var child in VisualChildren)
+                        {
+                            double snapPoint = 0;
+
+                            switch (snapPointsAlignment)
+                            {
+                                case SnapPointsAlignment.Near:
+                                    snapPoint = child.Bounds.Top;
+                                    break;
+                                case SnapPointsAlignment.Center:
+                                    snapPoint = child.Bounds.Center.Y;
+                                    break;
+                                case SnapPointsAlignment.Far:
+                                    snapPoint = child.Bounds.Bottom;
+                                    break;
+                            }
+
+                            snapPoints.Add(snapPoint);
+                        }
+                    }
+                    break;
+            }
+
+            return snapPoints;
+        }
+
+        /// <inheritdoc/>
+        public double GetRegularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment, out double offset)
+        {
+            offset = 0f;
+            var firstChild = VisualChildren.FirstOrDefault();
+
+            if(firstChild == null)
+            {
+                return 0;
+            }
+
+            double snapPoint = 0;
+
+            switch (Orientation)
+            {
+                case Orientation.Horizontal:
+                    if (!AreHorizontalSnapPointsRegular)
+                        throw new InvalidOperationException();
+
+                    snapPoint = firstChild.Bounds.Width;
+                    switch (snapPointsAlignment)
+                    {
+                        case SnapPointsAlignment.Near:
+                            offset = firstChild.Bounds.Left;
+                            break;
+                        case SnapPointsAlignment.Center:
+                            offset = firstChild.Bounds.Center.X;
+                            break;
+                        case SnapPointsAlignment.Far:
+                            offset = firstChild.Bounds.Right;
+                            break;
+                    }
+                    break;
+                case Orientation.Vertical:
+                    if (!AreVerticalSnapPointsRegular)
+                        throw new InvalidOperationException();
+                    snapPoint = firstChild.Bounds.Height;
+                    switch (snapPointsAlignment)
+                    {
+                        case SnapPointsAlignment.Near:
+                            offset = firstChild.Bounds.Top;
+                            break;
+                        case SnapPointsAlignment.Center:
+                            offset = firstChild.Bounds.Center.Y;
+                            break;
+                        case SnapPointsAlignment.Far:
+                            offset = firstChild.Bounds.Bottom;
+                            break;
+                    }
+                    break;
+            }
+
+            return snapPoint + Spacing;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index 33089344e8..f12a66a4e6 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -195,7 +195,7 @@ namespace Avalonia.Controls
             else
             {
                 var container = SelectedItem as IContentControl ??
-                    ItemContainerGenerator.ContainerFromIndex(SelectedIndex) as IContentControl;
+                    ContainerFromIndex(SelectedIndex) as IContentControl;
                 SelectedContentTemplate = container?.ContentTemplate;
                 SelectedContent = container?.Content;
             }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 9d07fb024a..78caf350b7 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -963,10 +963,8 @@ namespace Avalonia.Controls
 
                 var graphemeEnumerator = new GraphemeEnumerator(input.AsSpan());
 
-                while (graphemeEnumerator.MoveNext())
+                while (graphemeEnumerator.MoveNext(out var grapheme))
                 {
-                    var grapheme = graphemeEnumerator.Current;
-
                     if (grapheme.FirstCodepoint.IsBreakChar)
                     {
                         if (lineCount + 1 > MaxLines)
@@ -979,7 +977,7 @@ namespace Avalonia.Controls
                         }
                     }
 
-                    length += grapheme.Text.Length;
+                    length += grapheme.Length;
                 }
 
                 if (length < input.Length)
diff --git a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
index c1146cceda..10c2f36f43 100644
--- a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
+++ b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
@@ -79,7 +79,7 @@ namespace Avalonia.Controls
             {
                 if(run.Length > 0)
                 {
-#if NET6_0
+#if NET6_0_OR_GREATER
                     builder.Append(run.Text.Span);
 #else
                     builder.Append(run.Text.Span.ToArray());
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index ff241dce7a..3bd566c622 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -581,12 +581,21 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         private void HandleInput(RawInputEventArgs e)
         {
-            if (e is RawPointerEventArgs pointerArgs)
+            if (PlatformImpl != null)
             {
-                pointerArgs.InputHitTestResult = this.InputHitTest(pointerArgs.Position);
-            }
+                if (e is RawPointerEventArgs pointerArgs)
+                {
+                    pointerArgs.InputHitTestResult = this.InputHitTest(pointerArgs.Position);
+                }
 
-            _inputManager?.ProcessInput(e);
+                _inputManager?.ProcessInput(e);
+            }
+            else
+            {
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
+                    this,
+                    "PlatformImpl is null, couldn't handle input.");
+            }
         }
 
         private void SceneInvalidated(object? sender, SceneInvalidatedEventArgs e)
@@ -606,6 +615,13 @@ namespace Avalonia.Controls
                 KeyboardDevice.Instance?.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
         }
 
+        protected override bool BypassFlowDirectionPolicies => true;
+
+        public override void InvalidateMirrorTransform()
+        {
+            // Do nothing becuase TopLevel should't apply MirrorTransform on himself.
+        }
+
         ITextInputMethodImpl? ITextInputMethodRoot.InputMethod =>
             (PlatformImpl as ITopLevelImplWithTextInputMethod)?.TextInputMethod;
     }
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 2fc901438d..67e0d85436 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -575,7 +575,7 @@ namespace Avalonia.Controls
                     {
                         var previous = (TreeViewItem)parentItemsControl.ContainerFromIndex(index - 1)!;
                         result = previous.IsExpanded && previous.ItemCount > 0 ?
-                            (TreeViewItem)previous.ItemContainerGenerator.ContainerFromIndex(previous.ItemCount - 1)! :
+                            (TreeViewItem)previous.ContainerFromIndex(previous.ItemCount - 1)! :
                             previous;
                     }
                     else
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index fb20a7ee14..022e1a74b1 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -264,6 +264,18 @@ namespace Avalonia.Controls
                 Dispatcher.UIThread.Post(this.BringIntoView); // must use the Dispatcher, otherwise the TreeView doesn't scroll
             }
         }
+        
+        /// <summary>
+        /// Invoked when the <see cref="DoubleTapped"/> event occurs in the header.
+        /// </summary>
+        protected virtual void OnHeaderDoubleTapped(TappedEventArgs e)
+        {
+            if (ItemCount > 0)
+            {
+                IsExpanded = !IsExpanded;
+                e.Handled = true;
+            }
+        }
 
         private static int CalculateDistanceFromLogicalParent<T>(ILogical? logical, int @default = -1) where T : class
         {
@@ -280,11 +292,7 @@ namespace Avalonia.Controls
 
         private void HeaderDoubleTapped(object? sender, TappedEventArgs e)
         {
-            if (ItemCount > 0)
-            {
-                IsExpanded = !IsExpanded;
-                e.Handled = true;
-            }
+            OnHeaderDoubleTapped(e);
         }
     }
 }
diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index 3f539ce198..c5276741b6 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -3,8 +3,11 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Utils;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
@@ -14,7 +17,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Arranges and virtualizes content on a single line that is oriented either horizontally or vertically.
     /// </summary>
-    public class VirtualizingStackPanel : VirtualizingPanel
+    public class VirtualizingStackPanel : VirtualizingPanel, IScrollSnapPointsInfo
     {
         /// <summary>
         /// Defines the <see cref="Orientation"/> property.
@@ -22,6 +25,34 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Orientation> OrientationProperty =
             StackLayout.OrientationProperty.AddOwner<VirtualizingStackPanel>();
 
+        /// <summary>
+        /// Defines the <see cref="AreHorizontalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreHorizontalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<VirtualizingStackPanel, bool>(nameof(AreHorizontalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="AreVerticalSnapPointsRegular"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AreVerticalSnapPointsRegularProperty =
+            AvaloniaProperty.Register<VirtualizingStackPanel, bool>(nameof(AreVerticalSnapPointsRegular));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalSnapPointsChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> HorizontalSnapPointsChangedEvent =
+            RoutedEvent.Register<VirtualizingStackPanel, RoutedEventArgs>(
+                nameof(HorizontalSnapPointsChanged),
+                RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="VerticalSnapPointsChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> VerticalSnapPointsChangedEvent =
+            RoutedEvent.Register<VirtualizingStackPanel, RoutedEventArgs>(
+                nameof(VerticalSnapPointsChanged),
+                RoutingStrategies.Bubble);
+
         private static readonly AttachedProperty<bool> ItemIsOwnContainerProperty =
             AvaloniaProperty.RegisterAttached<VirtualizingStackPanel, Control, bool>("ItemIsOwnContainer");
 
@@ -62,6 +93,42 @@ namespace Avalonia.Controls
             set => SetValue(OrientationProperty, value);
         }
 
+        /// <summary>
+        /// Occurs when the measurements for horizontal snap points change.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? HorizontalSnapPointsChanged
+        {
+            add => AddHandler(HorizontalSnapPointsChangedEvent, value);
+            remove => RemoveHandler(HorizontalSnapPointsChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Occurs when the measurements for vertical snap points change.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs>? VerticalSnapPointsChanged
+        {
+            add => AddHandler(VerticalSnapPointsChangedEvent, value);
+            remove => RemoveHandler(VerticalSnapPointsChangedEvent, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the horizontal snap points for the <see cref="VirtualizingStackPanel"/> are equidistant from each other.
+        /// </summary>
+        public bool AreHorizontalSnapPointsRegular
+        {
+            get { return GetValue(AreHorizontalSnapPointsRegularProperty); }
+            set { SetValue(AreHorizontalSnapPointsRegularProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the vertical snap points for the <see cref="VirtualizingStackPanel"/> are equidistant from each other.
+        /// </summary>
+        public bool AreVerticalSnapPointsRegular
+        {
+            get { return GetValue(AreVerticalSnapPointsRegularProperty); }
+            set { SetValue(AreVerticalSnapPointsRegularProperty, value); }
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
             if (!IsEffectivelyVisible)
@@ -145,6 +212,8 @@ namespace Avalonia.Controls
             finally
             {
                 _isInLayout = false;
+
+                RaiseEvent(new RoutedEventArgs(Orientation == Orientation.Horizontal ? HorizontalSnapPointsChangedEvent : VerticalSnapPointsChangedEvent));
             }
         }
 
@@ -226,7 +295,7 @@ namespace Avalonia.Controls
             {
                 if (toIndex < 0)
                     toIndex = count - 1;
-                else if (toIndex >= count - 1)
+                else if (toIndex >= count)
                     toIndex = 0;
             }
 
@@ -622,6 +691,167 @@ namespace Avalonia.Controls
                 Invalidate(c);
         }
 
+        /// <inheritdoc/>
+        public IReadOnlyList<double> GetIrregularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment)
+        {
+            var snapPoints = new List<double>();
+
+            switch (orientation)
+            {
+                case Orientation.Horizontal:
+                    if (AreHorizontalSnapPointsRegular)
+                        throw new InvalidOperationException();
+                    if (Orientation == Orientation.Horizontal)
+                    {
+                        var averageElementSize = EstimateElementSizeU();
+                        double snapPoint = 0;
+                        for (var i = 0; i < Items.Count; i++)
+                        {
+                            var container = ContainerFromIndex(i);
+                            if (container != null)
+                            {
+                                switch (snapPointsAlignment)
+                                {
+                                    case SnapPointsAlignment.Near:
+                                        snapPoint = container.Bounds.Left;
+                                        break;
+                                    case SnapPointsAlignment.Center:
+                                        snapPoint = container.Bounds.Center.X;
+                                        break;
+                                    case SnapPointsAlignment.Far:
+                                        snapPoint = container.Bounds.Right;
+                                        break;
+                                }
+                            }
+                            else
+                            {
+                                if (snapPoint == 0)
+                                {
+                                    switch (snapPointsAlignment)
+                                    {
+                                        case SnapPointsAlignment.Center:
+                                            snapPoint = averageElementSize / 2;
+                                            break;
+                                        case SnapPointsAlignment.Far:
+                                            snapPoint = averageElementSize;
+                                            break;
+                                    }
+                                }
+                                else
+                                    snapPoint += averageElementSize;
+                            }
+
+                            snapPoints.Add(snapPoint);
+                        }
+                    }
+                    break;
+                case Orientation.Vertical:
+                    if (AreVerticalSnapPointsRegular)
+                        throw new InvalidOperationException();
+                    if (Orientation == Orientation.Vertical)
+                    {
+                        var averageElementSize = EstimateElementSizeU();
+                        double snapPoint = 0;
+                        for (var i = 0; i < Items.Count; i++)
+                        {
+                            var container = ContainerFromIndex(i);
+                            if (container != null)
+                            {
+                                switch (snapPointsAlignment)
+                                {
+                                    case SnapPointsAlignment.Near:
+                                        snapPoint = container.Bounds.Top;
+                                        break;
+                                    case SnapPointsAlignment.Center:
+                                        snapPoint = container.Bounds.Center.Y;
+                                        break;
+                                    case SnapPointsAlignment.Far:
+                                        snapPoint = container.Bounds.Bottom;
+                                        break;
+                                }
+                            }
+                            else
+                            {
+                                if (snapPoint == 0)
+                                {
+                                    switch (snapPointsAlignment)
+                                    {
+                                        case SnapPointsAlignment.Center:
+                                            snapPoint = averageElementSize / 2;
+                                            break;
+                                        case SnapPointsAlignment.Far:
+                                            snapPoint = averageElementSize;
+                                            break;
+                                    }
+                                }
+                                else
+                                    snapPoint += averageElementSize;
+                            }
+
+                            snapPoints.Add(snapPoint);
+                        }
+                    }
+                    break;
+            }
+
+            return snapPoints;
+        }
+
+        /// <inheritdoc/>
+        public double GetRegularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment, out double offset)
+        {
+            offset = 0f;
+            var firstRealizedChild = _realizedElements?.Elements.FirstOrDefault();
+
+            if (firstRealizedChild == null)
+            {
+                return 0;
+            }
+
+            double snapPoint = 0;
+
+            switch (Orientation)
+            {
+                case Orientation.Horizontal:
+                    if (!AreHorizontalSnapPointsRegular)
+                        throw new InvalidOperationException();
+
+                    snapPoint = firstRealizedChild.Bounds.Width;
+                    switch (snapPointsAlignment)
+                    {
+                        case SnapPointsAlignment.Near:
+                            offset = 0;
+                            break;
+                        case SnapPointsAlignment.Center:
+                            offset = (firstRealizedChild.Bounds.Right - firstRealizedChild.Bounds.Left) / 2;
+                            break;
+                        case SnapPointsAlignment.Far:
+                            offset = firstRealizedChild.Bounds.Width;
+                            break;
+                    }
+                    break;
+                case Orientation.Vertical:
+                    if (!AreVerticalSnapPointsRegular)
+                        throw new InvalidOperationException();
+                    snapPoint = firstRealizedChild.Bounds.Height;
+                    switch (snapPointsAlignment)
+                    {
+                        case SnapPointsAlignment.Near:
+                            offset = 0;
+                            break;
+                        case SnapPointsAlignment.Center:
+                            offset = (firstRealizedChild.Bounds.Bottom - firstRealizedChild.Bounds.Top) / 2;
+                            break;
+                        case SnapPointsAlignment.Far:
+                            offset = firstRealizedChild.Bounds.Height;
+                            break;
+                    }
+                    break;
+            }
+
+            return snapPoint;
+        }
+
         /// <summary>
         /// Stores the realized element state for a <see cref="VirtualizingStackPanel"/>.
         /// </summary>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs
index acf2e01264..103ac669b6 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs
@@ -17,7 +17,11 @@ namespace Avalonia.Diagnostics.Screenshots
 
         public async Task Take(Control control)
         {
+#if NET6_0_OR_GREATER
+            await using var output = await GetStream(control);
+#else
             using var output = await GetStream(control);
+#endif
             if (output is { })
             {
                 control.RenderTo(output);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index 2117996b96..a7d279741e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -14,57 +14,54 @@ namespace Avalonia.Diagnostics.Screenshots
     /// </summary>
     public sealed class FilePickerHandler : BaseRenderToStreamHandler
     {
+        private readonly string _title;
+        private readonly string _screenshotRoot;
+
         /// <summary>
         /// Instance FilePickerHandler
         /// </summary>
-        public FilePickerHandler()
+        public FilePickerHandler() : this(null, null)
         {
 
         }
+
         /// <summary>
         /// Instance FilePickerHandler with specificated parameter
         /// </summary>
         /// <param name="title">SaveFilePicker Title</param>
         /// <param name="screenshotRoot"></param>
-        public FilePickerHandler(string? title
-            , string? screenshotRoot = default
-            )
+        public FilePickerHandler(
+            string? title,
+            string? screenshotRoot = default)
         {
-            if (title is { })
-                Title = title;
-            if (screenshotRoot is { })
-                ScreenshotsRoot = screenshotRoot;
+            _title = title ?? "Save Screenshot to ...";
+            _screenshotRoot = screenshotRoot ?? Conventions.DefaultScreenshotsRoot;
         }
-        /// <summary>
-        /// Get the root folder where screeshots well be stored.
-        /// The default root folder is [Environment.SpecialFolder.MyPictures]/Screenshots.
-        /// </summary>
-        public string ScreenshotsRoot { get; }
-            = Conventions.DefaultScreenshotsRoot;
 
-        /// <summary>
-        /// SaveFilePicker Title
-        /// </summary>
-        public string Title { get; } = "Save Screenshot to ...";
-
-        static Window GetWindow(Control control)
+        private static TopLevel GetTopLevel(Control control)
         {
-            var window = control.VisualRoot as Window;
-            var app = Application.Current;
-            if (app?.ApplicationLifetime is Lifetimes.IClassicDesktopStyleApplicationLifetime desktop)
+            // If possible, use devtools main window.
+            TopLevel? devToolsTopLevel = null;
+            if (Application.Current?.ApplicationLifetime is Lifetimes.IClassicDesktopStyleApplicationLifetime desktop)
             {
-                window = desktop.Windows.FirstOrDefault(w => w is Views.MainWindow);
+                devToolsTopLevel = desktop.Windows.FirstOrDefault(w => w is Views.MainWindow);
             }
-            return window!;
+
+            return devToolsTopLevel ?? TopLevel.GetTopLevel(control)
+                ?? throw new InvalidOperationException("No TopLevel is available.");
         }
 
         protected override async Task<Stream?> GetStream(Control control)
         {
-            var result = await GetWindow(control).StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
+            var storageProvider = GetTopLevel(control).StorageProvider;
+            var defaultFolder = await storageProvider.TryGetFolderFromPath(_screenshotRoot)
+                                ?? await storageProvider.TryGetWellKnownFolder(WellKnownFolder.Pictures);
+
+            var result = await storageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
             {
-                SuggestedStartLocation = new BclStorageFolder(new DirectoryInfo(ScreenshotsRoot)),
-                Title = Title,
-                FileTypeChoices = new FilePickerFileType[] { new FilePickerFileType("PNG") { Patterns = new string[] { "*.png" } } },
+                SuggestedStartLocation = defaultFolder,
+                Title = _title,
+                FileTypeChoices = new [] { FilePickerFileTypes.ImagePng },
                 DefaultExtension = ".png"
             });
             if (result is null)
@@ -73,7 +70,7 @@ namespace Avalonia.Diagnostics.Screenshots
             }
             if (!result.CanOpenWrite)
             {
-                throw new InvalidOperationException("ReadOnly file was opened");
+                throw new InvalidOperationException("Read-only file was selected.");
             }
 
             return await result.OpenWriteAsync();
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index 99cf1538ae..be4bae26f1 100644
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@@ -14,6 +14,11 @@
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- For managed dialogs dev testing -->
+    <InternalsVisibleTo Include="ControlCatalog, PublicKey=$(AvaloniaPublicKey)" />    
+  </ItemGroup>
+  
   <Import Project="..\..\build\ApiDiff.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
diff --git a/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
index df67c06b73..46de460b1a 100644
--- a/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
@@ -260,17 +260,7 @@ namespace Avalonia.Dialogs.Internal
 
         public void Navigate(IStorageFolder path, string initialSelectionName = null)
         {
-            string fullDirectoryPath;
-
-            if (path?.TryGetUri(out var fullDirectoryUri) == true
-                && fullDirectoryUri.IsAbsoluteUri)
-            {
-                fullDirectoryPath = fullDirectoryUri.LocalPath;
-            }
-            else
-            {
-                fullDirectoryPath = Directory.GetCurrentDirectory();
-            }
+            var fullDirectoryPath = path?.TryGetFullPath() ?? Directory.GetCurrentDirectory();
             
             Navigate(fullDirectoryPath, initialSelectionName);
         }
diff --git a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
index bc5945441c..cad938ac35 100644
--- a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
+++ b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
@@ -51,9 +51,7 @@ namespace Avalonia.Dialogs
 
             var files = await impl.OpenFilePickerAsync(dialog.ToFilePickerOpenOptions());
             return files
-                .Select(file => file.TryGetUri(out var fullPath)
-                    ? fullPath.LocalPath
-                    : file.Name)
+                .Select(file => file.TryGetFullPath() ?? file.Name)
                 .ToArray();
         }
     }
diff --git a/src/Avalonia.Dialogs/ManagedStorageProvider.cs b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
index e45d5c1b4a..3e7c58c689 100644
--- a/src/Avalonia.Dialogs/ManagedStorageProvider.cs
+++ b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
@@ -11,7 +11,7 @@ using Avalonia.Platform.Storage.FileIO;
 
 namespace Avalonia.Dialogs;
 
-public class ManagedStorageProvider<T> : BclStorageProvider where T : Window, new()
+internal class ManagedStorageProvider<T> : BclStorageProvider where T : Window, new()
 {
     private readonly Window _parent;
     private readonly ManagedFileDialogOptions _managedOptions;
diff --git a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
index 8597f3922a..6f647215be 100644
--- a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
+++ b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
@@ -88,8 +88,8 @@ namespace Avalonia.FreeDesktop
 
             if (options.SuggestedFileName is { } currentName)
                 chooserOptions.Add("current_name", currentName);
-            if (options.SuggestedStartLocation?.TryGetUri(out var currentFolder) == true)
-                chooserOptions.Add("current_folder", Encoding.UTF8.GetBytes(currentFolder.ToString()));
+            if (options.SuggestedStartLocation?.TryGetFullPath() is { } folderPath)
+                chooserOptions.Add("current_folder", Encoding.UTF8.GetBytes(folderPath));
             objectPath = await _fileChooser.SaveFileAsync(parentWindow, options.Title ?? string.Empty, chooserOptions);
 
             var request = DBusHelper.Connection!.CreateProxy<IRequest>("org.freedesktop.portal.Request", objectPath);
@@ -131,7 +131,7 @@ namespace Avalonia.FreeDesktop
                 .Where(Directory.Exists)
                 .Select(path => new BclStorageFolder(new DirectoryInfo(path))).ToList();
         }
-
+        
         private static (string name, (uint style, string extension)[])[] ParseFilters(IReadOnlyList<FilePickerFileType>? fileTypes)
         {
             // Example: [('Images', [(0, '*.ico'), (1, 'image/png')]), ('Text', [(0, '*.txt')])]
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index cb79cc85db..514d3b3e07 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -9,6 +9,7 @@ using Avalonia.Rendering;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 
 namespace Avalonia.Headless
 {
@@ -49,6 +50,7 @@ namespace Avalonia.Headless
         public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2) => throw new NotImplementedException();
 
         public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces) => new HeadlessRenderTarget();
+        public bool IsLost => false;
         public object TryGetFeature(Type featureType) => null;
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
@@ -118,20 +120,28 @@ namespace Avalonia.Headless
             return new HeadlessGeometryStub(new Rect(glyphRun.Size));
         }
 
-        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        public IGlyphRunImpl CreateGlyphRun(
+            IGlyphTypeface glyphTypeface, 
+            double fontRenderingEmSize,
+            IReadOnlyList<GlyphInfo> glyphInfos, 
+            Point baselineOrigin)
         {
             return new HeadlessGlyphRunStub();
         }
 
         class HeadlessGlyphRunStub : IGlyphRunImpl
         {
+            public Size Size => new Size(8, 12);
+
+            public Point BaselineOrigin => new Point(0, 8);
+
             public void Dispose()
             {
             }
 
             public IReadOnlyList<float> GetIntersections(float lowerBound, float upperBound)
             {
-                throw new NotImplementedException();
+                return null;
             }
         }
 
@@ -462,7 +472,7 @@ namespace Avalonia.Headless
             {
             }
 
-            public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+            public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
             {
                 
             }
diff --git a/src/Avalonia.Headless/HeadlessWindowImpl.cs b/src/Avalonia.Headless/HeadlessWindowImpl.cs
index 195328cd65..2c19b2f85f 100644
--- a/src/Avalonia.Headless/HeadlessWindowImpl.cs
+++ b/src/Avalonia.Headless/HeadlessWindowImpl.cs
@@ -284,6 +284,18 @@ namespace Avalonia.Headless
                 button == 1 ? RawPointerEventType.MiddleButtonUp : RawPointerEventType.RightButtonUp,
                 point, modifiers));
         }
+        
+        void IHeadlessWindow.MouseWheel(Point point, Vector delta, RawInputModifiers modifiers)
+        {
+            Input?.Invoke(new RawMouseWheelEventArgs(MouseDevice, Timestamp, InputRoot,
+                point, delta, modifiers));
+        }
+        
+        void IHeadlessWindow.DragDrop(Point point, RawDragEventType type, IDataObject data, DragDropEffects effects, RawInputModifiers modifiers)
+        {
+            var device = AvaloniaLocator.Current.GetRequiredService<IDragDropDevice>();
+            Input?.Invoke(new RawDragEvent(device, type, InputRoot, point, data, effects, modifiers));
+        }
 
         void IWindowImpl.Move(PixelPoint point)
         {
diff --git a/src/Avalonia.Headless/IHeadlessWindow.cs b/src/Avalonia.Headless/IHeadlessWindow.cs
index 282662f98b..dfb3a4c433 100644
--- a/src/Avalonia.Headless/IHeadlessWindow.cs
+++ b/src/Avalonia.Headless/IHeadlessWindow.cs
@@ -1,4 +1,5 @@
 using Avalonia.Input;
+using Avalonia.Input.Raw;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -13,5 +14,7 @@ namespace Avalonia.Headless
         void MouseDown(Point point, int button, RawInputModifiers modifiers = RawInputModifiers.None);
         void MouseMove(Point point, RawInputModifiers modifiers = RawInputModifiers.None);
         void MouseUp(Point point, int button, RawInputModifiers modifiers = RawInputModifiers.None);
+        void MouseWheel(Point point, Vector delta, RawInputModifiers modifiers = RawInputModifiers.None);
+        void DragDrop(Point point, RawDragEventType type, IDataObject data, DragDropEffects effects, RawInputModifiers modifiers);
     }
 }
diff --git a/src/Avalonia.Native/SystemDialogs.cs b/src/Avalonia.Native/SystemDialogs.cs
index 49ba652b1a..60724507f3 100644
--- a/src/Avalonia.Native/SystemDialogs.cs
+++ b/src/Avalonia.Native/SystemDialogs.cs
@@ -33,8 +33,7 @@ namespace Avalonia.Native
         {
             using var events = new SystemDialogEvents();
 
-            var suggestedDirectory = options.SuggestedStartLocation?.TryGetUri(out var suggestedDirectoryTmp) == true
-                ? suggestedDirectoryTmp.LocalPath : string.Empty;
+            var suggestedDirectory = options.SuggestedStartLocation?.TryGetFullPath() ?? string.Empty;
 
             _native.OpenFileDialog((IAvnWindow)_window.Native,
                                     events,
@@ -54,8 +53,7 @@ namespace Avalonia.Native
         {
             using var events = new SystemDialogEvents();
 
-            var suggestedDirectory = options.SuggestedStartLocation?.TryGetUri(out var suggestedDirectoryTmp) == true
-                ? suggestedDirectoryTmp.LocalPath : string.Empty;
+            var suggestedDirectory = options.SuggestedStartLocation?.TryGetFullPath() ?? string.Empty;
 
             _native.SaveFileDialog((IAvnWindow)_window.Native,
                         events,
@@ -74,8 +72,7 @@ namespace Avalonia.Native
         {
             using var events = new SystemDialogEvents();
 
-            var suggestedDirectory = options.SuggestedStartLocation?.TryGetUri(out var suggestedDirectoryTmp) == true
-                ? suggestedDirectoryTmp.LocalPath : string.Empty;
+            var suggestedDirectory = options.SuggestedStartLocation?.TryGetFullPath() ?? string.Empty;
 
             _native.SelectFolderDialog((IAvnWindow)_window.Native, events, options.AllowMultiple.AsComBool(), options.Title ?? "", suggestedDirectory);
 
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 9b38c150fa..73493c69c0 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -15,7 +15,7 @@
     <Import Project="..\..\build\TrimmingEnable.props" />
 
   <ItemGroup>
-    <Compile Remove="..\Shared\SourceGeneratorAttributes.cs"/>
-    <None Include="..\Shared\SourceGeneratorAttributes.cs" Visible="false"/>
+    <Compile Remove="..\Shared\SourceGeneratorAttributes.cs" />
+    <None Include="..\Shared\SourceGeneratorAttributes.cs" Visible="false" />
   </ItemGroup>
 </Project>
diff --git a/src/Avalonia.OpenGL/Controls/CompositionOpenGlSwapchain.cs b/src/Avalonia.OpenGL/Controls/CompositionOpenGlSwapchain.cs
new file mode 100644
index 0000000000..3db0aafd7b
--- /dev/null
+++ b/src/Avalonia.OpenGL/Controls/CompositionOpenGlSwapchain.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+
+namespace Avalonia.OpenGL.Controls;
+
+internal class CompositionOpenGlSwapchain : SwapchainBase<IGlSwapchainImage>
+{
+    private readonly IGlContext _context;
+    private readonly IGlContextExternalObjectsFeature? _externalObjectsFeature;
+    private readonly IOpenGlTextureSharingRenderInterfaceContextFeature? _sharingFeature;
+
+    public CompositionOpenGlSwapchain(IGlContext context, ICompositionGpuInterop interop, CompositionDrawingSurface target,
+        IOpenGlTextureSharingRenderInterfaceContextFeature sharingFeature
+        ) : base(interop, target)
+    {
+        _context = context;
+        _sharingFeature = sharingFeature;
+    }
+    
+    public CompositionOpenGlSwapchain(IGlContext context, ICompositionGpuInterop interop, CompositionDrawingSurface target,
+        IGlContextExternalObjectsFeature externalObjectsFeature) : base(interop, target)
+    {
+        _context = context;
+        _externalObjectsFeature = externalObjectsFeature;
+    }
+    
+    
+
+    protected override IGlSwapchainImage CreateImage(PixelSize size)
+    {
+        if (_sharingFeature != null)
+            return new CompositionOpenGlSwapChainImage(_context, _sharingFeature, size, Interop, Target);
+        return new DxgiMutexOpenGlSwapChainImage(Interop, Target, _externalObjectsFeature!, size);
+    }
+
+    public IDisposable BeginDraw(PixelSize size, out IGlTexture texture)
+    {
+        var rv = BeginDrawCore(size, out var tex);
+        texture = tex;
+        return rv;
+    }
+}
+
+internal interface IGlTexture
+{
+    int TextureId { get; }
+    int InternalFormat { get; }
+    PixelSize Size { get; }
+}
+
+
+interface IGlSwapchainImage : ISwapchainImage, IGlTexture
+{
+    
+}
+internal class DxgiMutexOpenGlSwapChainImage : IGlSwapchainImage
+{
+    private readonly ICompositionGpuInterop _interop;
+    private readonly CompositionDrawingSurface _surface;
+    private readonly IGlExportableExternalImageTexture _texture;
+    private Task? _lastPresent;
+    private ICompositionImportedGpuImage? _imported;
+
+    public DxgiMutexOpenGlSwapChainImage(ICompositionGpuInterop interop, CompositionDrawingSurface surface,
+        IGlContextExternalObjectsFeature externalObjects, PixelSize size)
+    {
+        _interop = interop;
+        _surface = surface;
+        _texture = externalObjects.CreateImage(KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle,
+            size, PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm);
+    }
+    public async ValueTask DisposeAsync()
+    {
+        // The texture is already sent to the compositor, so we need to wait for its attempts to use the texture
+        // before destroying it
+        if (_imported != null)
+        {
+            // No need to wait for import / LastPresent since calls are serialized on the compositor side anyway
+            try
+            {
+                await _imported.DisposeAsync();
+            }
+            catch
+            {
+                // Ignore
+            }
+        }
+        _texture.Dispose();
+    }
+
+    public int TextureId => _texture.TextureId;
+    public int InternalFormat => _texture.InternalFormat;
+    public PixelSize Size => new(_texture.Properties.Width, _texture.Properties.Height);
+    public Task LastPresent => _lastPresent;
+    public void BeginDraw() => _texture.AcquireKeyedMutex(0);
+
+    public void Present()
+    {
+        _texture.ReleaseKeyedMutex(1);
+        _imported ??= _interop.ImportImage(_texture.GetHandle(), _texture.Properties);
+        _lastPresent = _surface.UpdateWithKeyedMutexAsync(_imported, 1, 0);
+    }
+}
+
+internal class CompositionOpenGlSwapChainImage : IGlSwapchainImage
+{
+    private readonly ICompositionGpuInterop _interop;
+    private readonly CompositionDrawingSurface _target;
+    private readonly ICompositionImportableOpenGlSharedTexture _texture;
+    private ICompositionImportedGpuImage? _imported;
+
+    public CompositionOpenGlSwapChainImage(
+        IGlContext context,
+        IOpenGlTextureSharingRenderInterfaceContextFeature sharingFeature,
+        PixelSize size,
+        ICompositionGpuInterop interop,
+        CompositionDrawingSurface target)
+    {
+        _interop = interop;
+        _target = target;
+        _texture = sharingFeature.CreateSharedTextureForComposition(context, size);
+    }
+
+    
+    public async ValueTask DisposeAsync()
+    {
+        // The texture is already sent to the compositor, so we need to wait for its attempts to use the texture
+        // before destroying it
+        if (_imported != null)
+        {
+            // No need to wait for import / LastPresent since calls are serialized on the compositor side anyway
+            try
+            {
+                await _imported.DisposeAsync();
+            }
+            catch
+            {
+                // Ignore
+            }
+        }
+
+        _texture.Dispose();
+    }
+
+    public int TextureId => _texture.TextureId;
+    public int InternalFormat => _texture.InternalFormat;
+    public PixelSize Size => _texture.Size;
+    public Task? LastPresent { get; private set; }
+    public void BeginDraw()
+    {
+        // No-op for texture sharing
+    }
+
+    public void Present()
+    {
+        _imported ??= _interop.ImportImage(_texture);
+        LastPresent = _target.UpdateAsync(_imported);
+    }
+}
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
index c62a3d8d2f..4d0663a12b 100644
--- a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -1,120 +1,53 @@
 using System;
+using System.Numerics;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Logging;
-using Avalonia.Media;
-using Avalonia.OpenGL.Imaging;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 using Avalonia.VisualTree;
-using static Avalonia.OpenGL.GlConsts;
-
+using Avalonia.Platform;
 namespace Avalonia.OpenGL.Controls
 {
     public abstract class OpenGlControlBase : Control
     {
-        private IGlContext _context;
-        private int _fb, _depthBuffer;
-        private OpenGlBitmap _bitmap;
-        private IOpenGlBitmapAttachment _attachment;
-        private PixelSize _depthBufferSize;
-        
+        private CompositionSurfaceVisual _visual;
+        private Action _update;
+        private bool _updateQueued;
         private Task<bool> _initialization;
-        private IOpenGlTextureSharingRenderInterfaceContextFeature _feature;
-
-        protected GlVersion GlVersion { get; private set; }
-        public sealed override void Render(DrawingContext context)
-        {
-            if(!EnsureInitialized())
-                return;
-            
-            using (_context.MakeCurrent())
-            {
-                _context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, _fb);
-                EnsureTextureAttachment();
-                EnsureDepthBufferAttachment(_context.GlInterface);
-                if(!CheckFramebufferStatus(_context.GlInterface))
-                    return;
-                
-                OnOpenGlRender(_context.GlInterface, _fb);
-                _attachment.Present();
-            }
-
-            context.DrawImage(_bitmap, new Rect(_bitmap.Size), new Rect(Bounds.Size));
-            base.Render(context);
-        }
+        private OpenGlControlBaseResources? _resources;
+        private Compositor? _compositor;
+        protected GlVersion GlVersion => _resources?.Context.Version ?? default;
         
-        void EnsureTextureAttachment()
+        public OpenGlControlBase()
         {
-            _context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, _fb);
-            if (_bitmap == null || _attachment == null || _bitmap.PixelSize != GetPixelSize())
-            {
-                _attachment?.Dispose();
-                _attachment = null;
-                _bitmap?.Dispose();
-                _bitmap = null;
-                _bitmap = new OpenGlBitmap(_feature, GetPixelSize(), new Vector(96, 96));
-                _attachment = _bitmap.CreateFramebufferAttachment(_context);
-            }
-        }
-        
-        void EnsureDepthBufferAttachment(GlInterface gl)
-        {
-            var size = GetPixelSize();
-            if (size == _depthBufferSize && _depthBuffer != 0)
-                return;
-                    
-            gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderBuffer);
-            if (_depthBuffer != 0) gl.DeleteRenderbuffer(_depthBuffer);
-
-            _depthBuffer = gl.GenRenderbuffer();
-            gl.BindRenderbuffer(GL_RENDERBUFFER, _depthBuffer);
-            gl.RenderbufferStorage(GL_RENDERBUFFER,
-                GlVersion.Type == GlProfileType.OpenGLES ? GL_DEPTH_COMPONENT16 : GL_DEPTH_COMPONENT,
-                size.Width, size.Height);
-            gl.FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthBuffer);
-            gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderBuffer);
+            _update = Update;
         }
 
         void DoCleanup()
         {
-            if (_context != null)
+            if (_initialization is { Status: TaskStatus.RanToCompletion } && _resources != null)
             {
-                using (_context.MakeCurrent())
+                try
                 {
-                    var gl = _context.GlInterface;
-                    gl.ActiveTexture(GL_TEXTURE0);
-                    gl.BindTexture(GL_TEXTURE_2D, 0);
-                    gl.BindFramebuffer(GL_FRAMEBUFFER, 0);
-                    if (_fb != 0)
-                        gl.DeleteFramebuffer(_fb);
-                    _fb = 0;
-                    if (_depthBuffer != 0)
-                        gl.DeleteRenderbuffer(_depthBuffer);
-                    _depthBuffer = 0;
-                    _attachment?.Dispose();
-                    _attachment = null;
-                    _bitmap?.Dispose();
-                    _bitmap = null;
-                    
-                    try
-                    {
-                        if (_initialization is { Status: TaskStatus.RanToCompletion, Result: true })
-                        {
-                            OnOpenGlDeinit(_context.GlInterface, _fb);
-                            _initialization = null;
-                        }
-                    }
-                    finally
+                    using (_resources.Context.EnsureCurrent())
                     {
-                        _context.Dispose();
-                        _context = null;
+                        OnOpenGlDeinit(_resources.Context.GlInterface);
                     }
                 }
+                catch(Exception e)
+                {
+                    Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                        "Unable to free user OpenGL resources: {exception}", e);
+                }
             }
 
-            _fb = _depthBuffer = 0;
-            _attachment = null;
-            _bitmap = null;
-            _feature = null;
+            ElementComposition.SetElementChildVisual(this, null);
+            _visual = null;
+            
+            _resources?.DisposeAsync();
+            _resources = null;
+            _initialization = null;
         }
 
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
@@ -123,95 +56,75 @@ namespace Avalonia.OpenGL.Controls
             base.OnDetachedFromVisualTree(e);
         }
 
-        private bool EnsureInitializedCore(IOpenGlTextureSharingRenderInterfaceContextFeature feature)
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
-            try
-            {
-                _context = feature.CreateSharedContext();
-                _feature = feature;
-            }
-            catch (Exception e)
-            {
-                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                    "Unable to initialize OpenGL: unable to create additional OpenGL context: {exception}", e);
-                return false;
-            }
+            base.OnAttachedToVisualTree(e);
+            _compositor = (this.GetVisualRoot()?.Renderer as IRendererWithCompositor)?.Compositor;
+            RequestNextFrameRendering();
+        }
 
-            if (_context == null)
-            {
-                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                    "Unable to initialize OpenGL: unable to create additional OpenGL context.");
-                return false;
-            }
+        private bool EnsureInitializedCore(
+            ICompositionGpuInterop interop,
+            IOpenGlTextureSharingRenderInterfaceContextFeature contextSharingFeature)
+        {
+            var surface = _compositor.CreateDrawingSurface();
 
-            GlVersion = _context.Version;
+            IGlContext ctx = null;
+            var contextFactory = AvaloniaLocator.Current.GetService<IPlatformGraphicsOpenGlContextFactory>();
             try
             {
-                _bitmap = new OpenGlBitmap(_feature, GetPixelSize(), new Vector(96, 96));
-                if (!_bitmap.SupportsContext(_context))
+                if (contextSharingFeature?.CanCreateSharedContext == true)
+                    _resources = OpenGlControlBaseResources.TryCreate(surface, interop, contextSharingFeature);
+
+                if(_resources == null)
+                {
+                    ctx = contextFactory.CreateContext(null);
+                    if (ctx.TryGetFeature<IGlContextExternalObjectsFeature>(out var externalObjects))
+                        _resources = OpenGlControlBaseResources.TryCreate(ctx, surface, interop, externalObjects);
+                    else
+                        ctx.Dispose();
+                }
+                
+                if(_resources == null)
                 {
                     Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                        "Unable to initialize OpenGL: unable to create OpenGlBitmap: OpenGL context is not compatible");
+                        "Unable to initialize OpenGL: current platform does not support multithreaded context sharing and shared memory");
                     return false;
                 }
             }
             catch (Exception e)
             {
-                _context.Dispose();
-                _context = null;
                 Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                    "Unable to initialize OpenGL: unable to create OpenGlBitmap: {exception}", e);
+                    "Unable to initialize OpenGL: {exception}", e);
+                ctx?.Dispose();
                 return false;
             }
+            
+            _visual = _compositor.CreateSurfaceVisual();
+            _visual.Size = new Vector2((float)Bounds.Width, (float)Bounds.Height);
+            _visual.Surface = _resources.Surface;
+            ElementComposition.SetElementChildVisual(this, _visual);
+            using (_resources.Context.MakeCurrent())
+                OnOpenGlInit(_resources.Context.GlInterface);
+            return true;
 
-            using (_context.MakeCurrent())
-            {
-                try
-                {
-                    _depthBufferSize = GetPixelSize();
-                    var gl = _context.GlInterface;
-                    _fb = gl.GenFramebuffer();
-                    gl.BindFramebuffer(GL_FRAMEBUFFER, _fb);
-                    
-                    EnsureDepthBufferAttachment(gl);
-                    EnsureTextureAttachment();
-
-                    return CheckFramebufferStatus(gl);
-                }
-                catch(Exception e)
-                {
-                    Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                        "Unable to initialize OpenGL FBO: {exception}", e);
-                    return false;
-                }
-            }
         }
-
-        private static bool CheckFramebufferStatus(GlInterface gl)
+        
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
-            var status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER);
-            if (status != GL_FRAMEBUFFER_COMPLETE)
+            if (_visual != null && change.Property == BoundsProperty)
             {
-                int code;
-                while ((code = gl.GetError()) != 0)
-                    Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                        "Unable to initialize OpenGL FBO: {code}", code);
-                return false;
+                _visual.Size = new Vector2((float)Bounds.Width, (float)Bounds.Height);
+                RequestNextFrameRendering();
             }
 
-            return true;
+            base.OnPropertyChanged(change);
         }
 
         void ContextLost()
         {
-            _context = null;
-            _feature = null;
             _initialization = null;
-            _attachment = null;
-            _bitmap = null;
-            _fb = 0;
-            _depthBuffer = 0;
-            _depthBufferSize = default;
+            _resources?.DisposeAsync();
             OnOpenGlLost();
         }
 
@@ -228,59 +141,106 @@ namespace Avalonia.OpenGL.Controls
                 if (_initialization is { IsCompleted: false })
                     return false;
 
-                if (_context.IsLost)
+                if (_resources!.Context.IsLost)
                     ContextLost();
                 else 
                     return true;
             }
 
             _initialization = InitializeAsync();
+
+            async void ContinueOnInitialization()
+            {
+                try
+                {
+                    await _initialization;
+                    RequestNextFrameRendering();
+                }
+                catch
+                {
+                    //
+                }
+            }
+            ContinueOnInitialization();
             return false;
 
         }
 
+        
+        private void Update()
+        {
+            _updateQueued = false;
+            if (VisualRoot == null)
+                return;
+            if(!EnsureInitialized())
+                return;
+            using (_resources.BeginDraw(GetPixelSize()))
+                OnOpenGlRender(_resources.Context.GlInterface, _resources.Fbo);
+        }
+
         private async Task<bool> InitializeAsync()
         {
+            if (_compositor == null)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to obtain Compositor instance");
+                return false;
+            }
+            
+            var gpuInteropTask = _compositor.TryGetCompositionGpuInterop();
+
             var contextSharingFeature =
                 (IOpenGlTextureSharingRenderInterfaceContextFeature)
-                await this.GetVisualRoot()!.Renderer.TryGetRenderInterfaceFeature(
+                await _compositor.TryGetRenderInterfaceFeature(
                     typeof(IOpenGlTextureSharingRenderInterfaceContextFeature));
+            var interop = await gpuInteropTask;
 
-            if (contextSharingFeature == null || !contextSharingFeature.CanCreateSharedContext)
+            if (interop == null)
             {
                 Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
-                    "Unable to initialize OpenGL: current platform does not support multithreaded context sharing");
+                    "Compositor backend doesn't support GPU interop");
                 return false;
             }
 
-            if (!EnsureInitializedCore(contextSharingFeature))
+            if (!EnsureInitializedCore(interop, contextSharingFeature))
             {
                 DoCleanup();
                 return false;
             }
 
-            using (_context.MakeCurrent())
-                OnOpenGlInit(_context.GlInterface, _fb);
-
-            InvalidateVisual();
+            using (_resources!.Context.MakeCurrent())
+                OnOpenGlInit(_resources.Context.GlInterface);
             
             return true;
         }
+
+        [Obsolete("Use RequestNextFrameRendering()")]
+        // ReSharper disable once MemberCanBeProtected.Global
+        public new void InvalidateVisual() => RequestNextFrameRendering(); 
         
+        public void RequestNextFrameRendering()
+        {
+            if ((_initialization == null || _initialization is { Status: TaskStatus.RanToCompletion }) &&
+                !_updateQueued)
+            {
+                _updateQueued = true;
+                _compositor?.RequestCompositionUpdate(_update);
+            }
+        }
+
         private PixelSize GetPixelSize()
         {
-            var scaling = VisualRoot.RenderScaling;
+            var scaling = VisualRoot!.RenderScaling;
             return new PixelSize(Math.Max(1, (int)(Bounds.Width * scaling)),
                 Math.Max(1, (int)(Bounds.Height * scaling)));
         }
-
-
-        protected virtual void OnOpenGlInit(GlInterface gl, int fb)
+        
+        protected virtual void OnOpenGlInit(GlInterface gl)
         {
             
         }
 
-        protected virtual void OnOpenGlDeinit(GlInterface gl, int fb)
+        protected virtual void OnOpenGlDeinit(GlInterface gl)
         {
             
         }
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlResources.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlResources.cs
new file mode 100644
index 0000000000..bda2bd1568
--- /dev/null
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlResources.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Logging;
+using Avalonia.Platform;
+using Avalonia.Reactive;
+using Avalonia.Rendering.Composition;
+using static Avalonia.OpenGL.GlConsts;
+namespace Avalonia.OpenGL.Controls;
+
+internal class OpenGlControlBaseResources : IAsyncDisposable
+{
+    private int _depthBuffer;
+    public int Fbo { get; private set; }
+    private PixelSize _depthBufferSize;
+    public CompositionDrawingSurface Surface { get; }
+    public CompositionOpenGlSwapchain _swapchain;
+    public IGlContext Context { get; private set; }
+    
+    public static OpenGlControlBaseResources? TryCreate(CompositionDrawingSurface surface,
+        ICompositionGpuInterop interop,
+        IOpenGlTextureSharingRenderInterfaceContextFeature feature)
+    {
+        IGlContext context;
+        try
+        {
+            context = feature.CreateSharedContext();
+        }
+        catch (Exception e)
+        {
+            Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                "Unable to initialize OpenGL: unable to create additional OpenGL context: {exception}", e);
+            return null;
+        }
+
+        if (context == null)
+        {
+            Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                "Unable to initialize OpenGL: unable to create additional OpenGL context.");
+            return null;
+        }
+
+        return new OpenGlControlBaseResources(context, surface, interop, feature, null);
+    }
+
+    public static OpenGlControlBaseResources? TryCreate(IGlContext context, CompositionDrawingSurface surface,
+        ICompositionGpuInterop interop, IGlContextExternalObjectsFeature externalObjects)
+    {
+        if (!interop.SupportedImageHandleTypes.Contains(KnownPlatformGraphicsExternalImageHandleTypes
+                .D3D11TextureGlobalSharedHandle)
+            || !externalObjects.SupportedExportableExternalImageTypes.Contains(
+                KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle))
+            return null;
+        return new OpenGlControlBaseResources(context, surface, interop, null, externalObjects);
+    }
+    
+    public OpenGlControlBaseResources(IGlContext context,
+        CompositionDrawingSurface surface,
+        ICompositionGpuInterop interop,
+        IOpenGlTextureSharingRenderInterfaceContextFeature? feature,
+        IGlContextExternalObjectsFeature? externalObjects
+        )
+    {
+        Context = context;
+        Surface = surface;
+        using (context.MakeCurrent())
+            Fbo = context.GlInterface.GenFramebuffer();
+        _swapchain =
+            feature != null ?
+                new CompositionOpenGlSwapchain(context, interop, Surface, feature) :
+                new CompositionOpenGlSwapchain(context, interop, Surface, externalObjects);
+    }
+
+    void UpdateDepthRenderbuffer(PixelSize size)
+    {
+        if (size == _depthBufferSize && _depthBuffer != 0)
+            return;
+
+        var gl = Context.GlInterface;
+        gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderBuffer);
+        if (_depthBuffer != 0) gl.DeleteRenderbuffer(_depthBuffer);
+
+        _depthBuffer = gl.GenRenderbuffer();
+        gl.BindRenderbuffer(GL_RENDERBUFFER, _depthBuffer);
+        gl.RenderbufferStorage(GL_RENDERBUFFER,
+            Context.Version.Type == GlProfileType.OpenGLES ? GL_DEPTH_COMPONENT16 : GL_DEPTH_COMPONENT,
+            size.Width, size.Height);
+        gl.FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthBuffer);
+        gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderBuffer);
+        _depthBufferSize = size;
+    }
+    
+    public IDisposable BeginDraw(PixelSize size)
+    {
+        var restoreContext = Context.EnsureCurrent();
+        IDisposable? imagePresent = null;
+        var success = false;
+        try
+        {
+            var gl = Context.GlInterface;
+            Context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, Fbo);
+            UpdateDepthRenderbuffer(size);
+
+            imagePresent = _swapchain.BeginDraw(size, out var texture);
+            gl.FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.TextureId, 0);
+
+            var status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER);
+            if (status != GL_FRAMEBUFFER_COMPLETE)
+            {
+                int code = gl.GetError();
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to configure OpenGL FBO: {code}", code);
+                throw OpenGlException.GetFormattedException("Unable to configure OpenGL FBO", code);
+            }
+
+            success = true;
+            return Disposable.Create(() =>
+            {
+                try
+                {
+                    Context.GlInterface.Flush();
+                    imagePresent.Dispose();
+                }
+                finally
+                {
+                    restoreContext.Dispose();
+                }
+            });
+        }
+        finally
+        {
+            if (!success)
+            {
+                imagePresent?.Dispose();
+                restoreContext.Dispose();
+            }
+        }
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (Context is { IsLost: false })
+        {
+            try
+            {
+                using (Context.MakeCurrent())
+                {
+                    var gl = Context.GlInterface;
+                    if (Fbo != 0)
+                        gl.DeleteFramebuffer(Fbo);
+                    Fbo = 0;
+                    if (_depthBuffer != 0)
+                        gl.DeleteRenderbuffer(_depthBuffer);
+                    _depthBuffer = 0;
+                }
+
+            }
+            catch
+            {
+                //
+            }
+
+            Surface.Dispose();
+            await _swapchain.DisposeAsync();
+
+            Context = null!;
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/Egl/EglConsts.cs b/src/Avalonia.OpenGL/Egl/EglConsts.cs
index 428d11857f..aff56ecfe0 100644
--- a/src/Avalonia.OpenGL/Egl/EglConsts.cs
+++ b/src/Avalonia.OpenGL/Egl/EglConsts.cs
@@ -64,7 +64,7 @@ namespace Avalonia.OpenGL.Egl
         public const int  EGL_WIDTH = 0x3057;
         public const int  EGL_WINDOW_BIT = 0x0004;
 
-//        public const int  EGL_BACK_BUFFER = 0x3084;
+        public const int  EGL_BACK_BUFFER = 0x3084;
 //        public const int  EGL_BIND_TO_TEXTURE_RGB = 0x3039;
 //        public const int  EGL_BIND_TO_TEXTURE_RGBA = 0x303A;
         public const int  EGL_CONTEXT_LOST = 0x300E;
@@ -73,11 +73,11 @@ namespace Avalonia.OpenGL.Egl
 //        public const int  EGL_MIPMAP_TEXTURE = 0x3082;
 //        public const int  EGL_MIPMAP_LEVEL = 0x3083;
 //        public const int  EGL_NO_TEXTURE = 0x305C;
-//        public const int  EGL_TEXTURE_2D = 0x305F;
-//        public const int  EGL_TEXTURE_FORMAT = 0x3080;
+        public const int  EGL_TEXTURE_2D = 0x305F;
+        public const int  EGL_TEXTURE_FORMAT = 0x3080;
 //        public const int  EGL_TEXTURE_RGB = 0x305D;
-//        public const int  EGL_TEXTURE_RGBA = 0x305E;
-//        public const int  EGL_TEXTURE_TARGET = 0x3081;
+        public const int  EGL_TEXTURE_RGBA = 0x305E;
+        public const int  EGL_TEXTURE_TARGET = 0x3081;
 
 //        public const int  EGL_ALPHA_FORMAT = 0x3088;
 //        public const int  EGL_ALPHA_FORMAT_NONPRE = 0x308B;
@@ -216,5 +216,7 @@ namespace Avalonia.OpenGL.Egl
         public const int  EGL_TEXTURE_OFFSET_Y_ANGLE = 0x3491;
 
         public const int  EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
+        
+        public const int EGL_TEXTURE_INTERNAL_FORMAT_ANGLE = 0x345D;
     }
 }
diff --git a/src/Avalonia.OpenGL/Egl/EglContext.cs b/src/Avalonia.OpenGL/Egl/EglContext.cs
index 0b4b7d26a1..48dfc6c4c0 100644
--- a/src/Avalonia.OpenGL/Egl/EglContext.cs
+++ b/src/Avalonia.OpenGL/Egl/EglContext.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using Avalonia.Platform;
 using Avalonia.Reactive;
@@ -19,21 +20,24 @@ namespace Avalonia.OpenGL.Egl
         private readonly object _lock;
 
         internal EglContext(EglDisplay display, EglInterface egl, EglContext sharedWith, IntPtr ctx, EglSurface offscreenSurface,
-            GlVersion version, int sampleCount, int stencilSize, Action disposeCallback, Dictionary<Type, object> features)
+            GlVersion version, int sampleCount, int stencilSize, Action disposeCallback, 
+            Dictionary<Type, Func<EglContext, object>> features)
         {
             _disp = display;
             _egl = egl;
             _sharedWith = sharedWith;
             _context = ctx;
             _disposeCallback = disposeCallback;
-            _features = features;
             OffscreenSurface = offscreenSurface;
             Version = version;
             SampleCount = sampleCount;
             StencilSize = stencilSize;
             _lock = display.ContextSharedSyncRoot ?? new object();
             using (MakeCurrent())
+            {
                 GlInterface = GlInterface.FromNativeUtf8GetProcAddress(version, _egl.GetProcAddress);
+                _features = features.ToDictionary(x => x.Key, x => x.Value(this));
+            }
         }
 
         public IntPtr Context =>
@@ -155,6 +159,14 @@ namespace Avalonia.OpenGL.Egl
         {
             if(_context == IntPtr.Zero)
                 return;
+            
+            foreach(var f in _features.ToList())
+                if (f.Value is IDisposable d)
+                {
+                    d.Dispose();
+                    _features.Remove(f.Key);
+                }
+
             _egl.DestroyContext(_disp.Handle, Context);
             OffscreenSurface?.Dispose();
             _context = IntPtr.Zero;
diff --git a/src/Avalonia.OpenGL/Egl/EglDisplay.cs b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
index c67d7674a8..60cad2fa1e 100644
--- a/src/Avalonia.OpenGL/Egl/EglDisplay.cs
+++ b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
@@ -93,7 +93,7 @@ namespace Avalonia.OpenGL.Egl
 
                 var rv = new EglContext(this, _egl, share, ctx, offscreenSurface,
                     _config.Version, _config.SampleCount, _config.StencilSize,
-                    options.DisposeCallback, options.ExtraFeatures);
+                    options.DisposeCallback, options.ExtraFeatures ?? new());
                 _contexts.Add(rv);
                 return rv;
             }
diff --git a/src/Avalonia.OpenGL/Egl/EglDisplayOptions.cs b/src/Avalonia.OpenGL/Egl/EglDisplayOptions.cs
index 5648645c54..906a533e2d 100644
--- a/src/Avalonia.OpenGL/Egl/EglDisplayOptions.cs
+++ b/src/Avalonia.OpenGL/Egl/EglDisplayOptions.cs
@@ -19,7 +19,7 @@ public class EglContextOptions
     public EglContext ShareWith { get; set; }
     public EglSurface OffscreenSurface { get; set; }
     public Action DisposeCallback { get; set; }
-    public Dictionary<Type, object> ExtraFeatures { get; set; }
+    public Dictionary<Type, Func<EglContext, object>> ExtraFeatures { get; set; }
 }
 
 public class EglDisplayCreationOptions : EglDisplayOptions
diff --git a/src/Avalonia.OpenGL/Egl/EglInterface.cs b/src/Avalonia.OpenGL/Egl/EglInterface.cs
index 06aafb4f57..d2d41f4def 100644
--- a/src/Avalonia.OpenGL/Egl/EglInterface.cs
+++ b/src/Avalonia.OpenGL/Egl/EglInterface.cs
@@ -98,6 +98,9 @@ namespace Avalonia.OpenGL.Egl
         [GetProcAddress("eglCreateWindowSurface")]
         public partial IntPtr CreateWindowSurface(IntPtr display, IntPtr config, IntPtr window, int[] attrs);
 
+        [GetProcAddress("eglBindTexImage")]
+        public partial int BindTexImage(IntPtr display, IntPtr surface, int buffer);
+
         [GetProcAddress("eglGetConfigAttrib")]
         public partial bool GetConfigAttrib(IntPtr display, IntPtr config, int attr, out int rv);
         
diff --git a/src/Avalonia.OpenGL/Features/ExternalObjectsOpenGlExtensionFeature.cs b/src/Avalonia.OpenGL/Features/ExternalObjectsOpenGlExtensionFeature.cs
new file mode 100644
index 0000000000..02d152ff61
--- /dev/null
+++ b/src/Avalonia.OpenGL/Features/ExternalObjectsOpenGlExtensionFeature.cs
@@ -0,0 +1,282 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Logging;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using Avalonia.SourceGenerator;
+using static Avalonia.OpenGL.GlConsts;
+
+namespace Avalonia.OpenGL.Features;
+
+unsafe partial class ExternalObjectsInterface
+{
+    public ExternalObjectsInterface(Func<string, IntPtr> getProcAddress)
+    {
+        Initialize(getProcAddress);
+    }
+    
+    [GetProcAddress("glImportMemoryFdEXT", true)]
+    public partial void ImportMemoryFdEXT(uint memory, ulong size, int handleType, int fd);
+    
+    [GetProcAddress("glImportSemaphoreFdEXT", true)]
+    public partial void ImportSemaphoreFdEXT(uint semaphore,
+                              int handleType,
+                              int fd);
+    
+    [GetProcAddress("glCreateMemoryObjectsEXT")]
+    public partial void CreateMemoryObjectsEXT(int n, out uint memoryObjects);
+    
+    [GetProcAddress("glDeleteMemoryObjectsEXT")]
+    public partial void DeleteMemoryObjectsEXT(int n, ref uint objects);
+
+    [GetProcAddress("glTexStorageMem2DEXT")]
+    public partial void TexStorageMem2DEXT(int target, int levels, int internalFormat, int width, int height,
+        uint memory, ulong offset);
+    
+    [GetProcAddress("glGenSemaphoresEXT")]
+    public partial void GenSemaphoresEXT(int n, out uint semaphores);
+
+    [GetProcAddress("glDeleteSemaphoresEXT")]
+    public partial void DeleteSemaphoresEXT(int n, ref uint semaphores);
+    
+    [GetProcAddress("glWaitSemaphoreEXT")]
+    public partial void WaitSemaphoreEXT(uint semaphore,
+        uint numBufferBarriers, uint* buffers,
+        uint numTextureBarriers, int* textures,
+        int* srcLayouts);
+    
+    [GetProcAddress("glSignalSemaphoreEXT")]
+    public partial void SignalSemaphoreEXT(uint semaphore,
+        uint numBufferBarriers, uint* buffers,
+        uint numTextureBarriers, int* textures,
+        int* dstLayouts);
+    
+    
+    [GetProcAddress("glGetUnsignedBytei_vEXT", true)]
+    public partial void GetUnsignedBytei_vEXT(int target, uint index, byte* data);
+    
+    [GetProcAddress("glGetUnsignedBytevEXT", true)]
+    public partial void GetUnsignedBytevEXT(int target, byte* data);
+}
+
+public class ExternalObjectsOpenGlExtensionFeature : IGlContextExternalObjectsFeature
+{
+    private readonly IGlContext _context;
+    private readonly ExternalObjectsInterface _ext;
+    private List<string> _imageTypes = new();
+    private List<string> _semaphoreTypes = new();
+
+    public static ExternalObjectsOpenGlExtensionFeature TryCreate(IGlContext context)
+    {
+        var extensions = context.GlInterface.GetExtensions();
+        if (extensions.Contains("GL_EXT_memory_object") && extensions.Contains("GL_EXT_semaphore"))
+        {
+            try
+            {
+                return new ExternalObjectsOpenGlExtensionFeature(context, extensions);
+            }
+            catch (Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log(nameof(ExternalObjectsOpenGlExtensionFeature),
+                    "Unable to initialize EXT_external_objects extension: " + e);
+            }
+        }
+
+        return null;
+    }
+
+    private unsafe ExternalObjectsOpenGlExtensionFeature(IGlContext context, List<string> extensions)
+    {
+        _context = context;
+        _ext = new ExternalObjectsInterface(_context.GlInterface.GetProcAddress);
+
+        if (_ext.IsGetUnsignedBytei_vEXTAvailable)
+        {
+            _context.GlInterface.GetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, out var numUiids);
+            if (numUiids > 0)
+            {
+                DeviceUuid = new byte[16];
+                fixed (byte* pUuid = DeviceUuid)
+                    _ext.GetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, 0, pUuid);
+            }
+        }
+
+        if (_ext.IsGetUnsignedBytevEXTAvailable)
+        {
+            if (extensions.Contains("GL_EXT_memory_object_win32") || extensions.Contains("GL_EXT_semaphore_win32"))
+            {
+                DeviceLuid = new byte[8];
+                fixed (byte* pLuid = DeviceLuid)
+                    _ext.GetUnsignedBytevEXT(GL_DEVICE_LUID_EXT, pLuid);
+            }
+        }
+
+        if (extensions.Contains("GL_EXT_memory_object_fd")
+            && extensions.Contains("GL_EXT_semaphore_fd"))
+        {
+            _imageTypes.Add(KnownPlatformGraphicsExternalImageHandleTypes.VulkanOpaquePosixFileDescriptor);
+            _semaphoreTypes.Add(KnownPlatformGraphicsExternalSemaphoreHandleTypes.VulkanOpaquePosixFileDescriptor);
+        }
+        
+
+
+    }
+
+    public IReadOnlyList<string> SupportedImportableExternalImageTypes => _imageTypes;
+    public IReadOnlyList<string> SupportedExportableExternalImageTypes { get; } = Array.Empty<string>();
+    public IReadOnlyList<string> SupportedImportableExternalSemaphoreTypes => _semaphoreTypes;
+    public IReadOnlyList<string> SupportedExportableExternalSemaphoreTypes { get; } = Array.Empty<string>();
+    public IReadOnlyList<PlatformGraphicsExternalImageFormat> GetSupportedFormatsForExternalMemoryType(string type)
+    {
+        return new[]
+        {
+            PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm
+        };
+    }
+
+    public IGlExportableExternalImageTexture CreateImage(string type, PixelSize size,
+        PlatformGraphicsExternalImageFormat format) =>
+        throw new NotSupportedException();
+
+    public IGlExportableExternalImageTexture CreateSemaphore(string type) => throw new NotSupportedException();
+
+    public IGlExternalImageTexture ImportImage(IPlatformHandle handle, PlatformGraphicsExternalImageProperties properties)
+    {
+        if(!_imageTypes.Contains(handle.HandleDescriptor))
+            throw new ArgumentException(handle.HandleDescriptor + " is not supported");
+        
+        if (handle.HandleDescriptor == KnownPlatformGraphicsExternalImageHandleTypes.VulkanOpaquePosixFileDescriptor)
+        {
+            while (_context.GlInterface.GetError() != 0)
+            {
+                //Skip existing errors
+            }
+            _ext.CreateMemoryObjectsEXT(1, out var memoryObject);
+            _ext.ImportMemoryFdEXT(memoryObject, properties.MemorySize, GL_HANDLE_TYPE_OPAQUE_FD_EXT,
+                handle.Handle.ToInt32());
+            
+            var err = _context.GlInterface.GetError();
+            if (err != 0)
+                throw OpenGlException.GetFormattedException("glImportMemoryFdEXT", err);
+
+            _context.GlInterface.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
+
+            var texture = _context.GlInterface.GenTexture();
+            _context.GlInterface.BindTexture(GL_TEXTURE_2D, texture);
+            _ext.TexStorageMem2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8, properties.Width, properties.Height,
+                memoryObject, properties.MemoryOffset);
+            err = _context.GlInterface.GetError();
+
+            _context.GlInterface.BindTexture(GL_TEXTURE_2D, oldTexture);
+            if (err != 0)
+                throw OpenGlException.GetFormattedException("glTexStorageMem2DEXT", err);
+            
+            return new ExternalImageTexture(_context, properties, _ext, memoryObject, texture);
+        }
+
+        throw new ArgumentException(handle.HandleDescriptor + " is not supported");
+    }
+
+    public IGlExternalSemaphore ImportSemaphore(IPlatformHandle handle)
+    {
+        if(!_semaphoreTypes.Contains(handle.HandleDescriptor))
+            throw new ArgumentException(handle.HandleDescriptor + " is not supported");
+
+        if (handle.HandleDescriptor ==
+            KnownPlatformGraphicsExternalSemaphoreHandleTypes.VulkanOpaquePosixFileDescriptor)
+        {
+            _ext.GenSemaphoresEXT(1, out var semaphore);
+            _ext.ImportSemaphoreFdEXT(semaphore, GL_HANDLE_TYPE_OPAQUE_FD_EXT, handle.Handle.ToInt32());
+            return new ExternalSemaphore(_context, _ext, semaphore);
+        }
+        
+        throw new ArgumentException(handle.HandleDescriptor + " is not supported");
+    }
+
+    public CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType)
+    {
+        if (imageHandleType == KnownPlatformGraphicsExternalImageHandleTypes.VulkanOpaquePosixFileDescriptor)
+            return CompositionGpuImportedImageSynchronizationCapabilities.Semaphores;
+        return default;
+    }
+
+    public byte[] DeviceLuid { get; }
+    public byte[] DeviceUuid { get; }
+
+    unsafe class ExternalSemaphore : IGlExternalSemaphore
+    {
+        private readonly IGlContext _context;
+        private readonly ExternalObjectsInterface _ext;
+        private uint _semaphore;
+
+        public ExternalSemaphore(IGlContext context, ExternalObjectsInterface ext, uint semaphore)
+        {
+            _context = context;
+            _ext = ext;
+            _semaphore = semaphore;
+        }
+
+        public void Dispose()
+        {
+            if(_context.IsLost)
+                return;
+            using (_context.EnsureCurrent())
+                _ext.DeleteSemaphoresEXT(1, ref _semaphore);
+            _semaphore = 0;
+        }
+
+        public void WaitSemaphore(IGlExternalImageTexture texture)
+        {
+            var tex = (ExternalImageTexture)texture;
+            var texId = tex.TextureId;
+            var srcLayout = GL_LAYOUT_TRANSFER_SRC_EXT;
+            _ext.WaitSemaphoreEXT(_semaphore, 0, null, 1, &texId, &srcLayout);
+        }
+        
+        public void SignalSemaphore(IGlExternalImageTexture texture)
+        {
+            var tex = (ExternalImageTexture)texture;
+            var texId = tex.TextureId;
+            var dstLayout = 0;
+            _ext.SignalSemaphoreEXT(_semaphore, 0, null, 1, &texId, &dstLayout);
+        }
+    }
+
+    class ExternalImageTexture : IGlExternalImageTexture
+    {
+        private readonly IGlContext _context;
+        private readonly ExternalObjectsInterface _ext;
+        private uint _objectId;
+
+        public ExternalImageTexture(IGlContext context,
+            PlatformGraphicsExternalImageProperties properties,
+            ExternalObjectsInterface ext, uint objectId, int textureId)
+        {
+            Properties = properties;
+            TextureId = textureId;
+            _context = context;
+            _ext = ext;
+            _objectId = objectId;
+        }
+        
+        public void Dispose()
+        {
+            if(_context.IsLost)
+                return;
+            using (_context.EnsureCurrent())
+            {
+                _context.GlInterface.DeleteTexture(TextureId);
+                _ext.DeleteMemoryObjectsEXT(1, ref _objectId);
+                _objectId = 0;
+            }
+        }
+
+        public void AcquireKeyedMutex(uint key) => throw new NotSupportedException();
+
+        public void ReleaseKeyedMutex(uint key) => throw new NotSupportedException();
+
+        public int TextureId { get; }
+        public int InternalFormat => GL_RGBA8;
+        public PlatformGraphicsExternalImageProperties Properties { get; }
+    }
+}
diff --git a/src/Avalonia.OpenGL/GlConsts.cs b/src/Avalonia.OpenGL/GlConsts.cs
index 3fdc147701..4fbe738ca9 100644
--- a/src/Avalonia.OpenGL/GlConsts.cs
+++ b/src/Avalonia.OpenGL/GlConsts.cs
@@ -534,7 +534,7 @@ namespace Avalonia.OpenGL
 //        public const int GL_MAX_ELEMENTS_VERTICES = 0x80E8;
 //        public const int GL_MAX_ELEMENTS_INDICES = 0x80E9;
 //        public const int GL_BGR = 0x80E0;
-//        public const int GL_BGRA = 0x80E1;
+        public const int GL_BGRA = 0x80E1;
 //        public const int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
 //        public const int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
 //        public const int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
@@ -3372,16 +3372,16 @@ namespace Avalonia.OpenGL
 //        public const int GL_TILING_TYPES_EXT = 0x9583;
 //        public const int GL_OPTIMAL_TILING_EXT = 0x9584;
 //        public const int GL_LINEAR_TILING_EXT = 0x9585;
-//        public const int GL_NUM_DEVICE_UUIDS_EXT = 0x9596;
-//        public const int GL_DEVICE_UUID_EXT = 0x9597;
+        internal const int GL_NUM_DEVICE_UUIDS_EXT = 0x9596;
+        internal const int GL_DEVICE_UUID_EXT = 0x9597;
 //        public const int GL_DRIVER_UUID_EXT = 0x9598;
 //        public const int GL_UUID_SIZE_EXT = 16;
 //        public const int GL_EXT_memory_object_fd = 1;
-//        public const int GL_HANDLE_TYPE_OPAQUE_FD_EXT = 0x9586;
+        internal const int GL_HANDLE_TYPE_OPAQUE_FD_EXT = 0x9586;
 //        public const int GL_EXT_memory_object_win32 = 1;
 //        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_EXT = 0x9587;
 //        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT = 0x9588;
-//        public const int GL_DEVICE_LUID_EXT = 0x9599;
+        public const int GL_DEVICE_LUID_EXT = 0x9599;
 //        public const int GL_DEVICE_NODE_MASK_EXT = 0x959A;
 //        public const int GL_LUID_SIZE_EXT = 8;
 //        public const int GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT = 0x9589;
@@ -3483,11 +3483,11 @@ namespace Avalonia.OpenGL
 //        public const int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E;
 //        public const int GL_EXT_semaphore = 1;
 //        public const int GL_LAYOUT_GENERAL_EXT = 0x958D;
-//        public const int GL_LAYOUT_COLOR_ATTACHMENT_EXT = 0x958E;
+        internal const int GL_LAYOUT_COLOR_ATTACHMENT_EXT = 0x958E;
 //        public const int GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT = 0x958F;
 //        public const int GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT = 0x9590;
 //        public const int GL_LAYOUT_SHADER_READ_ONLY_EXT = 0x9591;
-//        public const int GL_LAYOUT_TRANSFER_SRC_EXT = 0x9592;
+        internal const int GL_LAYOUT_TRANSFER_SRC_EXT = 0x9592;
 //        public const int GL_LAYOUT_TRANSFER_DST_EXT = 0x9593;
 //        public const int GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT = 0x9530;
 //        public const int GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT = 0x9531;
diff --git a/src/Avalonia.OpenGL/IGlContextExternalObjectsFeature.cs b/src/Avalonia.OpenGL/IGlContextExternalObjectsFeature.cs
new file mode 100644
index 0000000000..676f8eaf86
--- /dev/null
+++ b/src/Avalonia.OpenGL/IGlContextExternalObjectsFeature.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+
+namespace Avalonia.OpenGL;
+
+public interface IGlContextExternalObjectsFeature
+{
+    IReadOnlyList<string> SupportedImportableExternalImageTypes { get; }
+    IReadOnlyList<string> SupportedExportableExternalImageTypes { get; }
+    IReadOnlyList<string> SupportedImportableExternalSemaphoreTypes { get; }
+    IReadOnlyList<string> SupportedExportableExternalSemaphoreTypes { get; }
+    IReadOnlyList<PlatformGraphicsExternalImageFormat> GetSupportedFormatsForExternalMemoryType(string type);
+
+    IGlExportableExternalImageTexture CreateImage(string type,PixelSize size, PlatformGraphicsExternalImageFormat format);
+
+    IGlExportableExternalImageTexture CreateSemaphore(string type);
+    IGlExternalImageTexture ImportImage(IPlatformHandle handle, PlatformGraphicsExternalImageProperties properties);
+    IGlExternalSemaphore ImportSemaphore(IPlatformHandle handle);
+    CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType);
+    public byte[]? DeviceLuid { get; }
+    public byte[]? DeviceUuid { get; }
+}
+
+public interface IGlExternalSemaphore : IDisposable
+{
+    void WaitSemaphore(IGlExternalImageTexture texture);
+    void SignalSemaphore(IGlExternalImageTexture texture);
+}
+
+public interface IGlExportableExternalSemaphore : IGlExternalSemaphore
+{
+    IPlatformHandle GetHandle();
+}
+
+public interface IGlExternalImageTexture : IDisposable
+{
+    void AcquireKeyedMutex(uint key);
+    void ReleaseKeyedMutex(uint key);
+    int TextureId { get; }
+    int InternalFormat { get; }
+    
+    PlatformGraphicsExternalImageProperties Properties { get; }
+}
+
+public interface IGlExportableExternalImageTexture : IGlExternalImageTexture
+{
+    IPlatformHandle GetHandle();
+}
diff --git a/src/Avalonia.OpenGL/IOpenGlTextureSharingRenderInterfaceContextFeature.cs b/src/Avalonia.OpenGL/IOpenGlTextureSharingRenderInterfaceContextFeature.cs
index 9c22d446ef..2043e944d1 100644
--- a/src/Avalonia.OpenGL/IOpenGlTextureSharingRenderInterfaceContextFeature.cs
+++ b/src/Avalonia.OpenGL/IOpenGlTextureSharingRenderInterfaceContextFeature.cs
@@ -1,6 +1,6 @@
+using System;
 using System.Collections.Generic;
-using Avalonia.OpenGL.Imaging;
-using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
 
 namespace Avalonia.OpenGL
 {
@@ -8,6 +8,13 @@ namespace Avalonia.OpenGL
     {
         bool CanCreateSharedContext { get; }
         IGlContext CreateSharedContext(IEnumerable<GlVersion> preferredVersions = null);
-        IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi);
+        ICompositionImportableOpenGlSharedTexture CreateSharedTextureForComposition(IGlContext context, PixelSize size);
+    }
+
+    public interface ICompositionImportableOpenGlSharedTexture : ICompositionImportableSharedGpuContextImage
+    {
+        int TextureId { get; }
+        int InternalFormat { get; }
+        PixelSize Size { get; }
     }
 }
diff --git a/src/Avalonia.OpenGL/IPlatformGraphicsOpenGlContextFactory.cs b/src/Avalonia.OpenGL/IPlatformGraphicsOpenGlContextFactory.cs
new file mode 100644
index 0000000000..e6c83415e6
--- /dev/null
+++ b/src/Avalonia.OpenGL/IPlatformGraphicsOpenGlContextFactory.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Avalonia.OpenGL;
+
+public interface IPlatformGraphicsOpenGlContextFactory
+{
+    IGlContext CreateContext(IEnumerable<GlVersion>? versions);
+}
diff --git a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
deleted file mode 100644
index 22f0cebf57..0000000000
--- a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using Avalonia.Metadata;
-using Avalonia.Platform;
-
-namespace Avalonia.OpenGL.Imaging
-{
-    [Unstable]
-    public interface IOpenGlBitmapImpl : IBitmapImpl
-    {
-        IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context, Action presentCallback);
-        bool SupportsContext(IGlContext context);
-    }
-
-    [Unstable]
-    public interface IOpenGlBitmapAttachment : IDisposable
-    {
-        void Present();
-    }
-}
diff --git a/src/Avalonia.OpenGL/Imaging/OpenGlBitmap.cs b/src/Avalonia.OpenGL/Imaging/OpenGlBitmap.cs
deleted file mode 100644
index 53013ae5a3..0000000000
--- a/src/Avalonia.OpenGL/Imaging/OpenGlBitmap.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using Avalonia.Threading;
-
-namespace Avalonia.OpenGL.Imaging
-{
-    public class OpenGlBitmap : Bitmap, IAffectsRender
-    {
-        private IOpenGlBitmapImpl _impl;
-
-        public OpenGlBitmap(IOpenGlTextureSharingRenderInterfaceContextFeature feature,
-            PixelSize size, Vector dpi) 
-            : base(CreateOrThrow(feature, size, dpi))
-        {
-            _impl = (IOpenGlBitmapImpl)PlatformImpl.Item;
-        }
-
-        static IOpenGlBitmapImpl CreateOrThrow(IOpenGlTextureSharingRenderInterfaceContextFeature feature,
-            PixelSize size, Vector dpi) => feature.CreateOpenGlBitmap(size, dpi);
-
-        public IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context) =>
-            _impl.CreateFramebufferAttachment(context, SetIsDirty);
-
-        public bool SupportsContext(IGlContext context) => _impl.SupportsContext(context);
-        
-        void SetIsDirty()
-        {
-            if (Dispatcher.UIThread.CheckAccess())
-                CallInvalidated();
-            else
-                Dispatcher.UIThread.Post(CallInvalidated);
-        }
-
-        private void CallInvalidated() => Invalidated?.Invoke(this, EventArgs.Empty);
-
-        public event EventHandler Invalidated;
-    }
-}
diff --git a/src/Avalonia.OpenGL/OpenGlException.cs b/src/Avalonia.OpenGL/OpenGlException.cs
index efe305dba5..c498ed7833 100644
--- a/src/Avalonia.OpenGL/OpenGlException.cs
+++ b/src/Avalonia.OpenGL/OpenGlException.cs
@@ -27,6 +27,9 @@ namespace Avalonia.OpenGL
             return GetFormattedException(funcName, (GlErrors)err, err);
         }
 
+        public static OpenGlException GetFormattedException(string funcName, int errorCode) =>
+            GetFormattedException(funcName, (GlErrors)errorCode, errorCode);
+
         public static OpenGlException GetFormattedEglException(string funcName, int errorCode) =>
             GetFormattedException(funcName, (EglErrors)errorCode,errorCode);
 
diff --git a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
index 1306985f5f..19a29b9466 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
@@ -9,6 +9,8 @@
                 CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{TemplateBinding Padding}">
           <ItemsPresenter Name="PART_ItemsPresenter"
+                          AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}"
+                          AreHorizontalSnapPointsRegular="{TemplateBinding AreHorizontalSnapPointsRegular}"
                           ItemsPanel="{TemplateBinding ItemsPanel}"/>
         </Border>
       </ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index ec0b876c71..4b9fb76b8a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -29,11 +29,15 @@
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer Name="PART_ScrollViewer"
+                        VerticalSnapPointsType="{TemplateBinding (ScrollViewer.VerticalSnapPointsType)}"
+                        HorizontalSnapPointsType="{TemplateBinding (ScrollViewer.HorizontalSnapPointsType)}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
             <ItemsPresenter Name="PART_ItemsPresenter"
+                            AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}"
+                            AreHorizontalSnapPointsRegular="{TemplateBinding AreHorizontalSnapPointsRegular}"
                             ItemsPanel="{TemplateBinding ItemsPanel}"
                             Margin="{TemplateBinding Padding}"/>
           </ScrollViewer>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index e87f4b7d93..72a7797bc3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -92,6 +92,7 @@
 
               <ContentPresenter Name="PART_HeaderPresenter"
                                 Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding ItemTemplate}"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Stretch"
                                 RecognizesAccessKey="True"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index 71df4d419f..7a8c15bf60 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -34,12 +34,17 @@
                                   Content="{TemplateBinding Content}"
                                   Extent="{TemplateBinding Extent, Mode=TwoWay}"
                                   Padding="{TemplateBinding Padding}"
+                                  HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
+                                  VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}"
+                                  HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
+                                  VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
                                   Offset="{TemplateBinding Offset, Mode=TwoWay}"
                                   Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
                                   IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
             <ScrollContentPresenter.GestureRecognizers>
               <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                       IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}"/>
             </ScrollContentPresenter.GestureRecognizers>
           </ScrollContentPresenter>
           <ScrollBar Name="PART_HorizontalScrollBar"
diff --git a/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
index d85cf193fa..8cf4e0be08 100644
--- a/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
@@ -10,6 +10,8 @@
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ItemsPresenter Name="PART_ItemsPresenter"
+                          AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}"
+                          AreHorizontalSnapPointsRegular="{TemplateBinding AreHorizontalSnapPointsRegular}"
                           ItemsPanel="{TemplateBinding ItemsPanel}" />
         </Border>
       </ControlTemplate>
diff --git a/src/Avalonia.Themes.Simple/Controls/ListBox.xaml b/src/Avalonia.Themes.Simple/Controls/ListBox.xaml
index e1257ef10f..eaa1f914ca 100644
--- a/src/Avalonia.Themes.Simple/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ListBox.xaml
@@ -20,9 +20,13 @@
                         Background="{TemplateBinding Background}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                        VerticalSnapPointsType="{TemplateBinding (ScrollViewer.VerticalSnapPointsType)}"
+                        HorizontalSnapPointsType="{TemplateBinding (ScrollViewer.HorizontalSnapPointsType)}">
             <ItemsPresenter Name="PART_ItemsPresenter"
                             Margin="{TemplateBinding Padding}"
+                            AreVerticalSnapPointsRegular="{TemplateBinding AreVerticalSnapPointsRegular}"
+                            AreHorizontalSnapPointsRegular="{TemplateBinding AreHorizontalSnapPointsRegular}"
                             ItemsPanel="{TemplateBinding ItemsPanel}" />
           </ScrollViewer>
         </Border>
diff --git a/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml b/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
index de31f90d64..6056938938 100644
--- a/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
@@ -42,7 +42,8 @@
                               Grid.Column="2"
                               Margin="{TemplateBinding Padding}"
                               VerticalAlignment="Center"
-                              Content="{TemplateBinding Header}">
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding ItemTemplate}">
               <ContentPresenter.DataTemplates>
                 <DataTemplate DataType="sys:String">
                   <AccessText Text="{Binding}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
index e11fbb6f15..7029792467 100644
--- a/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
@@ -13,7 +13,11 @@
                                   Background="{TemplateBinding Background}"
                                   CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
                                   CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-                                  Content="{TemplateBinding Content}"
+                                  Content="{TemplateBinding Content}"                                  
+                                  HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
+                                  VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}"
+                                  HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
+                                  VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
                                   Extent="{TemplateBinding Extent,
                                                            Mode=TwoWay}"
                                   IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}"
diff --git a/src/Avalonia.X11/Glx/GlxContext.cs b/src/Avalonia.X11/Glx/GlxContext.cs
index 88006f0b47..572e4a6077 100644
--- a/src/Avalonia.X11/Glx/GlxContext.cs
+++ b/src/Avalonia.X11/Glx/GlxContext.cs
@@ -2,7 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Features;
 using Avalonia.Reactive;
+
 namespace Avalonia.X11.Glx
 {
     class GlxContext : IGlContext
@@ -14,6 +16,7 @@ namespace Avalonia.X11.Glx
         private readonly IntPtr _defaultXid;
         private readonly bool _ownsPBuffer;
         private readonly object _lock = new object();
+        private ExternalObjectsOpenGlExtensionFeature? _externalObjects;
 
         public GlxContext(GlxInterface glx, IntPtr handle, GlxDisplay display,
             GlxContext sharedWith,
@@ -32,7 +35,10 @@ namespace Avalonia.X11.Glx
             SampleCount = sampleCount;
             StencilSize = stencilSize;
             using (MakeCurrent())
+            {
                 GlInterface = new GlInterface(version, GlxInterface.SafeGetProcAddress);
+                _externalObjects = ExternalObjectsOpenGlExtensionFeature.TryCreate(this);
+            }
         }
         
         public GlxDisplay Display { get; }
@@ -123,6 +129,11 @@ namespace Avalonia.X11.Glx
                 Glx.DestroyPbuffer(_x11.Display, _defaultXid);
         }
 
-        public object TryGetFeature(Type featureType) => null;
+        public object TryGetFeature(Type featureType)
+        {
+            if (featureType == typeof(IGlContextExternalObjectsFeature))
+                return _externalObjects;
+            return null;
+        }
     }
 }
diff --git a/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs b/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs
index 5fe0f46b14..07a11ff2ec 100644
--- a/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs
+++ b/src/Avalonia.X11/NativeDialogs/CompositeStorageProvider.cs
@@ -61,4 +61,22 @@ internal class CompositeStorageProvider : IStorageProvider
         var provider = await EnsureStorageProvider().ConfigureAwait(false);
         return await provider.OpenFolderBookmarkAsync(bookmark).ConfigureAwait(false);
     }
+
+    public async Task<IStorageFile?> TryGetFileFromPath(Uri filePath)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.TryGetFileFromPath(filePath).ConfigureAwait(false);
+    }
+
+    public async Task<IStorageFolder?> TryGetFolderFromPath(Uri folderPath)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.TryGetFolderFromPath(folderPath).ConfigureAwait(false);
+    }
+
+    public async Task<IStorageFolder?> TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+    {
+        var provider = await EnsureStorageProvider().ConfigureAwait(false);
+        return await provider.TryGetWellKnownFolder(wellKnownFolder).ConfigureAwait(false);
+    }
 }
diff --git a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
index 89aa0340b5..ceb32e52e9 100644
--- a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
+++ b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
@@ -59,7 +59,7 @@ namespace Avalonia.X11.NativeDialogs
                 return res?.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray() ?? Array.Empty<IStorageFolder>();
             });
         }
-
+        
         public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
         {
             return await await RunOnGlibThread(async () =>
@@ -196,10 +196,10 @@ namespace Avalonia.X11.NativeDialogs
                 gtk_dialog_add_button(dlg, open, GtkResponseType.Cancel);
             }
 
-            Uri? folderPath = null;
-            if (initialFolder?.TryGetUri(out folderPath) == true)
+            var folderLocalPath = initialFolder?.TryGetFullPath();
+            if (folderLocalPath is not null)
             {
-                using var dir = new Utf8Buffer(folderPath.LocalPath);
+                using var dir = new Utf8Buffer(folderLocalPath);
                 gtk_file_chooser_set_current_folder(dlg, dir);
             }
 
@@ -207,7 +207,7 @@ namespace Avalonia.X11.NativeDialogs
             {
                 // gtk_file_chooser_set_filename() expects full path
                 using var fn = action == GtkFileChooserAction.Open
-                    ? new Utf8Buffer(Path.Combine(folderPath?.LocalPath ?? "", initialFileName))
+                    ? new Utf8Buffer(Path.Combine(folderLocalPath ?? "", initialFileName))
                     : new Utf8Buffer(initialFileName);
 
                 if (action == GtkFileChooserAction.Save)
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 861fed0803..84331aa43a 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -731,7 +731,7 @@ namespace Avalonia.X11
         void DispatchInput(RawInputEventArgs args)
         {
             Input?.Invoke(args);
-            if (!args.Handled && args is RawKeyEventArgsWithText text && !string.IsNullOrWhiteSpace(text.Text))
+            if (!args.Handled && args is RawKeyEventArgsWithText text && !string.IsNullOrEmpty(text.Text))
                 Input?.Invoke(new RawTextInputEventArgs(_keyboard, args.Timestamp, _inputRoot, text.Text));
         }
 
diff --git a/src/Browser/Avalonia.Browser/Interop/StorageHelper.cs b/src/Browser/Avalonia.Browser/Interop/StorageHelper.cs
index e50f8790ef..a4d7bcdb87 100644
--- a/src/Browser/Avalonia.Browser/Interop/StorageHelper.cs
+++ b/src/Browser/Avalonia.Browser/Interop/StorageHelper.cs
@@ -25,6 +25,9 @@ internal static partial class StorageHelper
     public static partial Task<JSObject?> SaveFileDialog(JSObject? startIn, string? suggestedName,
         [JSMarshalAs<JSType.Array<JSType.Any>>] object[]? types, bool excludeAcceptAllOption);
 
+    [JSImport("StorageItem.createWellKnownDirectory", AvaloniaModule.StorageModuleName)]
+    public static partial JSObject CreateWellKnownDirectory(string wellKnownDirectory);
+    
     [JSImport("StorageProvider.openBookmark", AvaloniaModule.StorageModuleName)]
     public static partial Task<JSObject?> OpenBookmark(string key);
 
diff --git a/src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs b/src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs
index 0bebcb9f63..7e8e2e0990 100644
--- a/src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs
+++ b/src/Browser/Avalonia.Browser/Storage/BrowserStorageProvider.cs
@@ -116,6 +116,33 @@ internal class BrowserStorageProvider : IStorageProvider
         return item is not null ? new JSStorageFolder(item) : null;
     }
 
+    public Task<IStorageFile?> TryGetFileFromPath(Uri filePath)
+    {
+        return Task.FromResult<IStorageFile?>(null);
+    }
+
+    public Task<IStorageFolder?> TryGetFolderFromPath(Uri folderPath)
+    {
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public async Task<IStorageFolder?> TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+    {
+        await _lazyModule.Value;
+        var directory = StorageHelper.CreateWellKnownDirectory(wellKnownFolder switch
+        {
+            WellKnownFolder.Desktop => "desktop",
+            WellKnownFolder.Documents => "documents",
+            WellKnownFolder.Downloads => "downloads",
+            WellKnownFolder.Music => "music",
+            WellKnownFolder.Pictures => "pictures",
+            WellKnownFolder.Videos => "videos",
+            _ => throw new ArgumentOutOfRangeException(nameof(wellKnownFolder), wellKnownFolder, null)
+        });
+
+        return new JSStorageFolder(directory);
+    }
+
     private static (JSObject[]? types, bool excludeAllOption) ConvertFileTypes(IEnumerable<FilePickerFileType>? input)
     {
         var types = input?
@@ -145,12 +172,7 @@ internal abstract class JSStorageItem : IStorageBookmarkItem
     internal JSObject FileHandle => _fileHandle ?? throw new ObjectDisposedException(nameof(JSStorageItem));
 
     public string Name => FileHandle.GetPropertyAsString("name") ?? string.Empty;
-
-    public bool TryGetUri([NotNullWhen(true)] out Uri? uri)
-    {
-        uri = new Uri(Name, UriKind.Relative);
-        return false;
-    }
+    public Uri Path => new Uri(Name, UriKind.Relative);
 
     public async Task<StorageItemProperties> GetBasicPropertiesAsync()
     {
diff --git a/src/Browser/Avalonia.Browser/webapp/modules/storage/storageItem.ts b/src/Browser/Avalonia.Browser/webapp/modules/storage/storageItem.ts
index b4cf3d278b..c6e5254329 100644
--- a/src/Browser/Avalonia.Browser/webapp/modules/storage/storageItem.ts
+++ b/src/Browser/Avalonia.Browser/webapp/modules/storage/storageItem.ts
@@ -1,14 +1,29 @@
 import { avaloniaDb, fileBookmarksStore } from "./indexedDb";
 
 export class StorageItem {
-    constructor(public handle: FileSystemHandle, private readonly bookmarkId?: string) { }
+    constructor(
+        public handle?: FileSystemHandle,
+        private readonly bookmarkId?: string,
+        public wellKnownType?: WellKnownDirectory
+    ) {
+    }
 
     public get name(): string {
-        return this.handle.name;
+        if (this.handle) {
+            return this.handle.name;
+        }
+        return this.wellKnownType ?? "";
+    }
+
+    public get kind(): "file" | "directory" {
+        if (this.handle) {
+            return this.handle.kind;
+        }
+        return "directory";
     }
 
-    public get kind(): string {
-        return this.handle.kind;
+    public static createWellKnownDirectory(type: WellKnownDirectory) {
+        return new StorageItem(undefined, undefined, type);
     }
 
     public static async openRead(item: StorageItem): Promise<Blob> {
@@ -48,7 +63,7 @@ export class StorageItem {
     }
 
     public static async getItems(item: StorageItem): Promise<StorageItems> {
-        if (item.handle.kind !== "directory") {
+        if (item.kind !== "directory" || !item.handle) {
             return new StorageItems([]);
         }
 
@@ -60,6 +75,10 @@ export class StorageItem {
     }
 
     private async verityPermissions(mode: FileSystemPermissionMode): Promise<void | never> {
+        if (!this.handle) {
+            return;
+        }
+
         if (await this.handle.queryPermission({ mode }) === "granted") {
             return;
         }
@@ -69,11 +88,14 @@ export class StorageItem {
         }
     }
 
-    public static async saveBookmark(item: StorageItem): Promise<string> {
+    public static async saveBookmark(item: StorageItem): Promise<string | null> {
         // If file was previously bookmarked, just return old one.
         if (item.bookmarkId) {
             return item.bookmarkId;
         }
+        if (!item.handle) {
+            return null;
+        }
 
         const connection = await avaloniaDb.connect();
         try {
diff --git a/src/Browser/Avalonia.Browser/webapp/modules/storage/storageProvider.ts b/src/Browser/Avalonia.Browser/webapp/modules/storage/storageProvider.ts
index 0198f92528..e621a1ed30 100644
--- a/src/Browser/Avalonia.Browser/webapp/modules/storage/storageProvider.ts
+++ b/src/Browser/Avalonia.Browser/webapp/modules/storage/storageProvider.ts
@@ -17,7 +17,7 @@ export class StorageProvider {
         startIn: StorageItem | null): Promise<StorageItem> {
         // 'Picker' API doesn't accept "null" as a parameter, so it should be set to undefined.
         const options: DirectoryPickerOptions = {
-            startIn: (startIn?.handle ?? undefined)
+            startIn: (startIn?.wellKnownType ?? startIn?.handle ?? undefined)
         };
 
         const handle = await window.showDirectoryPicker(options);
@@ -28,7 +28,7 @@ export class StorageProvider {
         startIn: StorageItem | null, multiple: boolean,
         types: FilePickerAcceptType[] | null, excludeAcceptAllOption: boolean): Promise<StorageItems> {
         const options: OpenFilePickerOptions = {
-            startIn: (startIn?.handle ?? undefined),
+            startIn: (startIn?.wellKnownType ?? startIn?.handle ?? undefined),
             multiple,
             excludeAcceptAllOption,
             types: (types ?? undefined)
@@ -42,7 +42,7 @@ export class StorageProvider {
         startIn: StorageItem | null, suggestedName: string | null,
         types: FilePickerAcceptType[] | null, excludeAcceptAllOption: boolean): Promise<StorageItem> {
         const options: SaveFilePickerOptions = {
-            startIn: (startIn?.handle ?? undefined),
+            startIn: (startIn?.wellKnownType ?? startIn?.handle ?? undefined),
             suggestedName: (suggestedName ?? undefined),
             excludeAcceptAllOption,
             types: (types ?? undefined)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index aab6239a35..0b61316603 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -126,7 +126,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             AvaloniaObjectSetStyledPropertyValue = AvaloniaObject
                 .FindMethod(m => m.IsPublic && !m.IsStatic && m.Name == "SetValue"
                                  && m.Parameters.Count == 3
-                                 && m.Parameters[0].Name == "StyledPropertyBase`1"
+                                 && m.Parameters[0].Name == "StyledProperty`1"
                                  && m.Parameters[2].Equals(BindingPriority));
             IBinding = cfg.TypeSystem.GetType("Avalonia.Data.IBinding");
             IDisposable = cfg.TypeSystem.GetType("System.IDisposable");
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
index 9990ad4731..d0a4de09ab 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             };
         }
 
-        protected override ExpressionObserver CreateExpressionObserver(AvaloniaObject target, AvaloniaProperty targetProperty, object anchor, bool enableDataValidation)
+        private protected override ExpressionObserver CreateExpressionObserver(AvaloniaObject target, AvaloniaProperty targetProperty, object anchor, bool enableDataValidation)
         {
             if (Source != null)
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
index b7f2261324..2b62d33349 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
         }
 
         [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.CompiledBindingSafeSupressWarningMessage)]
-        public ExpressionNode BuildExpression(bool enableValidation)
+        internal ExpressionNode BuildExpression(bool enableValidation)
         {
             ExpressionNode pathRoot = null;
             ExpressionNode path = null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs
index 1252ec7eca..b543fd9c01 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs
@@ -3,7 +3,7 @@ using Avalonia.Data.Core;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
 {
-    public class StrongTypeCastNode : TypeCastNode
+    internal class StrongTypeCastNode : TypeCastNode
     {
         private Func<object, object> _cast;
 
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index e3878b5bc6..ec44eeb38f 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -19,6 +19,7 @@
   <Import Project="..\..\..\build\TrimmingEnable.props" />
 
   <ItemGroup Label="InternalsVisibleTo">
+    <InternalsVisibleTo Include="Avalonia.Markup.Xaml, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Markup.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
   </ItemGroup>
 </Project>
diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index 66907f33d0..37e7be5e3f 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -56,7 +56,7 @@ namespace Avalonia.Data
         /// </summary>
         public Func<string, string, Type>? TypeResolver { get; set; }
 
-        protected override ExpressionObserver CreateExpressionObserver(AvaloniaObject target, AvaloniaProperty? targetProperty, object? anchor, bool enableDataValidation)
+        private protected override ExpressionObserver CreateExpressionObserver(AvaloniaObject target, AvaloniaProperty? targetProperty, object? anchor, bool enableDataValidation)
         {
             _ = target ?? throw new ArgumentNullException(nameof(target));
 
diff --git a/src/Markup/Avalonia.Markup/Data/BindingBase.cs b/src/Markup/Avalonia.Markup/Data/BindingBase.cs
index 90f312a249..8c8c50763b 100644
--- a/src/Markup/Avalonia.Markup/Data/BindingBase.cs
+++ b/src/Markup/Avalonia.Markup/Data/BindingBase.cs
@@ -70,7 +70,7 @@ namespace Avalonia.Data
 
         public WeakReference<INameScope>? NameScope { get; set; }
 
-        protected abstract ExpressionObserver CreateExpressionObserver(
+        private protected abstract ExpressionObserver CreateExpressionObserver(
             AvaloniaObject target,
             AvaloniaProperty? targetProperty,
             object? anchor,
@@ -127,7 +127,7 @@ namespace Avalonia.Data
             return new InstancedBinding(subject, Mode, Priority);
         }
 
-        protected ExpressionObserver CreateDataContextObserver(
+        private protected ExpressionObserver CreateDataContextObserver(
             AvaloniaObject target,
             ExpressionNode node,
             bool targetIsDataContext,
@@ -162,7 +162,7 @@ namespace Avalonia.Data
             }
         }
 
-        protected ExpressionObserver CreateElementObserver(
+        private protected ExpressionObserver CreateElementObserver(
             StyledElement target,
             string elementName,
             ExpressionNode node)
@@ -178,7 +178,7 @@ namespace Avalonia.Data
             return result;
         }
 
-        protected ExpressionObserver CreateFindAncestorObserver(
+        private protected ExpressionObserver CreateFindAncestorObserver(
             StyledElement target,
             RelativeSource relativeSource,
             ExpressionNode node)
@@ -211,7 +211,7 @@ namespace Avalonia.Data
                 null);
         }
 
-        protected ExpressionObserver CreateSourceObserver(
+        private protected ExpressionObserver CreateSourceObserver(
             object source,
             ExpressionNode node)
         {
@@ -220,7 +220,7 @@ namespace Avalonia.Data
             return new ExpressionObserver(source, node);
         }
 
-        protected ExpressionObserver CreateTemplatedParentObserver(
+        private protected ExpressionObserver CreateTemplatedParentObserver(
             AvaloniaObject target,
             ExpressionNode node)
         {
diff --git a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
index 1515ff2c90..993f63b4d3 100644
--- a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
@@ -85,8 +85,8 @@ namespace Avalonia.Data
 
             var children = Bindings.Select(x => x.Initiate(target, null));
 
-            var input = children.Select(x => x?.Observable!)
-                                .Where(x => x is not null)
+            var input = children.Select(x => x?.Source)
+                                .Where(x => x is not null)!
                                 .CombineLatest()
                                 .Select(x => ConvertValue(x, targetType, converter))
                                 .Where(x => x != BindingOperations.DoNothing);
diff --git a/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs b/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
index 4270063f87..ba321db144 100644
--- a/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
@@ -137,9 +137,9 @@ namespace Avalonia.Data
                     templatedParent.GetValue(Property) :
                     _target.TemplatedParent;
 
-                if (Converter is not null && _targetType is not null)
+                if (Converter is not null)
                 {
-                    value = Converter.Convert(value, _targetType, ConverterParameter, CultureInfo.CurrentCulture);
+                    value = Converter.Convert(value, _targetType ?? typeof(object), ConverterParameter, CultureInfo.CurrentCulture);
                 }
 
                 PublishNext(value);
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs
index 00f40dfcd3..97e9698c13 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionObserverBuilder.cs
@@ -6,7 +6,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Parsers
 {
-    public static class ExpressionObserverBuilder
+    internal static class ExpressionObserverBuilder
     {
         [RequiresUnreferencedCode(TrimmingMessages.ReflectionBindingRequiresUnreferencedCodeMessage)]
         internal static (ExpressionNode Node, SourceMode Mode) Parse(string expression, bool enableValidation = false, Func<string, string, Type>? typeResolver = null,
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs
index 4fc17e440b..e676c74879 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs
@@ -6,7 +6,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Markup.Parsers.Nodes
 {
-    public class ElementNameNode : ExpressionNode
+    internal class ElementNameNode : ExpressionNode
     {
         private readonly WeakReference<INameScope> _nameScope;
         private readonly string _name;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs
index ffbd34d492..383a160814 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs
@@ -5,7 +5,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Markup.Parsers.Nodes
 {
-    public class FindAncestorNode : ExpressionNode
+    internal class FindAncestorNode : ExpressionNode
     {
         private readonly int _level;
         private readonly Type? _ancestorType;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs
index 1cd233c68a..2cb87efa65 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Markup.Parsers.Nodes
 {
-    public class SelfNode : ExpressionNode
+    internal class SelfNode : ExpressionNode
     {
         public override string Description => "$self";
     }
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index ffe8352865..4c3cfe2ef4 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -23,6 +23,7 @@
   <ItemGroup Label="InternalsVisibleTo">
     <InternalsVisibleTo Include="Avalonia.Skia.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Skia.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Benchmarks, PublicKey=$(AvaloniaPublicKey)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 8b71f4e17e..dcb20d2a44 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -492,15 +492,15 @@ namespace Avalonia.Skia
         }
        
         /// <inheritdoc />
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
         {
             CheckLease();
-            using (var paintWrapper = CreatePaint(_fillPaint, foreground, glyphRun.Size))
+            using (var paintWrapper = CreatePaint(_fillPaint, foreground, glyphRun.Item.Size))
             {
-                var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
+                var glyphRunImpl = (GlyphRunImpl)glyphRun.Item;
 
-                Canvas.DrawText(glyphRunImpl.TextBlob, (float)glyphRun.BaselineOrigin.X,
-                    (float)glyphRun.BaselineOrigin.Y, paintWrapper.Paint);
+                Canvas.DrawText(glyphRunImpl.TextBlob, (float)glyphRun.Item.BaselineOrigin.X,
+                    (float)glyphRun.Item.BaselineOrigin.Y, paintWrapper.Paint);
             }
         }
 
diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
index dd7ed31a6e..cc669f9aaa 100644
--- a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
@@ -11,9 +11,13 @@ namespace Avalonia.Skia
     [Unstable]
     public class GlyphRunImpl : IGlyphRunImpl
     {
-        public GlyphRunImpl(SKTextBlob textBlob)
+        public GlyphRunImpl(SKTextBlob textBlob, Size size, Point baselineOrigin)
         {
             TextBlob = textBlob ?? throw new ArgumentNullException (nameof (textBlob));
+
+            Size = size;
+
+            BaselineOrigin = baselineOrigin;
         }
 
         /// <summary>
@@ -21,6 +25,10 @@ namespace Avalonia.Skia
         /// </summary>
         public SKTextBlob TextBlob { get; }
 
+        public Size Size { get; }
+
+        public Point BaselineOrigin { get; }
+
         public IReadOnlyList<float> GetIntersections(float upperBound, float lowerBound) => 
             TextBlob.GetIntercepts(lowerBound, upperBound);
 
diff --git a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
index b064445a0b..a5782037f3 100644
--- a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Avalonia.OpenGL;
-using Avalonia.OpenGL.Imaging;
 using Avalonia.Platform;
 using SkiaSharp;
 
@@ -33,9 +31,4 @@ namespace Avalonia.Skia
         bool CanBlit { get; }
         void Blit(SKCanvas canvas);
     }
-
-    public interface IOpenGlAwareSkiaGpu : ISkiaGpu
-    {
-        IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi);
-    }
 }
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaExternalObjectsFeature.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaExternalObjectsFeature.cs
new file mode 100644
index 0000000000..4bf43634ef
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaExternalObjectsFeature.cs
@@ -0,0 +1,191 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using Avalonia.OpenGL;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using SkiaSharp;
+
+namespace Avalonia.Skia;
+
+internal class GlSkiaExternalObjectsFeature : IExternalObjectsRenderInterfaceContextFeature
+{
+    private readonly GlSkiaGpu _gpu;
+    private readonly IGlContextExternalObjectsFeature? _feature;
+
+    public GlSkiaExternalObjectsFeature(GlSkiaGpu gpu, IGlContextExternalObjectsFeature? feature)
+    {
+        _gpu = gpu;
+        _feature = feature;
+    }
+
+    public IReadOnlyList<string> SupportedImageHandleTypes => _feature?.SupportedImportableExternalImageTypes
+                                                              ?? Array.Empty<string>();
+    public IReadOnlyList<string> SupportedSemaphoreTypes => _feature?.SupportedImportableExternalSemaphoreTypes
+                                                            ?? Array.Empty<string>();
+
+    public IPlatformRenderInterfaceImportedImage ImportImage(IPlatformHandle handle,
+        PlatformGraphicsExternalImageProperties properties)
+    {
+        if (_feature == null)
+            throw new NotSupportedException("Importing this platform handle is not supported");
+        using (_gpu.EnsureCurrent())
+        {
+            var image = _feature.ImportImage(handle, properties);
+            return new GlSkiaImportedImage(_gpu, image);
+        }
+    }
+
+    public IPlatformRenderInterfaceImportedImage ImportImage(ICompositionImportableSharedGpuContextImage image)
+    {
+        var img = (GlSkiaSharedTextureForComposition)image;
+        if (!img.Context.IsSharedWith(_gpu.GlContext))
+            throw new InvalidOperationException("Contexts do not belong to the same share group");
+        
+        return new GlSkiaImportedImage(_gpu, img);
+    }
+
+    public IPlatformRenderInterfaceImportedSemaphore ImportSemaphore(IPlatformHandle handle)
+    {
+        if (_feature == null)
+            throw new NotSupportedException("Importing this platform handle is not supported");
+        using (_gpu.EnsureCurrent())
+        {
+            var semaphore = _feature.ImportSemaphore(handle);
+            return new GlSkiaImportedSemaphore(_gpu, semaphore);
+        }
+    }
+
+    public CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType)
+        => _feature?.GetSynchronizationCapabilities(imageHandleType) ?? default;
+
+    public byte[]? DeviceUuid => _feature?.DeviceUuid;
+    public byte[]? DeviceLuid => _feature?.DeviceLuid;
+}
+
+internal class GlSkiaImportedSemaphore : IPlatformRenderInterfaceImportedSemaphore
+{
+    private readonly GlSkiaGpu _gpu;
+    public IGlExternalSemaphore Semaphore { get; }
+
+    public GlSkiaImportedSemaphore(GlSkiaGpu gpu, IGlExternalSemaphore semaphore)
+    {
+        _gpu = gpu;
+        Semaphore = semaphore;
+    }
+
+    public void Dispose() => Semaphore.Dispose();
+}
+
+internal class GlSkiaImportedImage : IPlatformRenderInterfaceImportedImage
+{
+    private readonly GlSkiaSharedTextureForComposition? _sharedTexture;
+    private readonly GlSkiaGpu _gpu;
+    private readonly IGlExternalImageTexture? _image;
+
+    public GlSkiaImportedImage(GlSkiaGpu gpu, IGlExternalImageTexture image)
+    {
+        _gpu = gpu;
+        _image = image;
+    }
+
+    public GlSkiaImportedImage(GlSkiaGpu gpu, GlSkiaSharedTextureForComposition sharedTexture)
+    {
+        _gpu = gpu;
+        _sharedTexture = sharedTexture;
+    }
+
+    public void Dispose()
+    {
+        _image?.Dispose();
+        _sharedTexture?.Dispose(_gpu.GlContext);
+    }
+
+    SKColorType ConvertColorType(PlatformGraphicsExternalImageFormat format) =>
+        format switch
+        {
+            PlatformGraphicsExternalImageFormat.B8G8R8A8UNorm => SKColorType.Bgra8888,
+            PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm => SKColorType.Rgba8888,
+            _ => SKColorType.Rgba8888
+        };
+
+    SKSurface? TryCreateSurface(int textureId, int format, int width, int height, bool topLeft)
+    {
+        var origin = topLeft ? GRSurfaceOrigin.TopLeft : GRSurfaceOrigin.BottomLeft; 
+        using var texture = new GRBackendTexture(width, height, false,
+            new GRGlTextureInfo(GlConsts.GL_TEXTURE_2D, (uint)textureId, (uint)format));
+        var surf = SKSurface.Create(_gpu.GrContext, texture, origin, SKColorType.Rgba8888);
+        if (surf != null)
+            return surf;
+        
+        using var unformatted = new GRBackendTexture(width, height, false,
+            new GRGlTextureInfo(GlConsts.GL_TEXTURE_2D, (uint)textureId));
+        
+        return SKSurface.Create(_gpu.GrContext, unformatted, origin, SKColorType.Rgba8888);
+    }
+    
+    IBitmapImpl TakeSnapshot()
+    {
+        var width = _image?.Properties.Width ?? _sharedTexture!.Size.Width;
+        var height = _image?.Properties.Height ?? _sharedTexture!.Size.Height;
+        var internalFormat = _image?.InternalFormat ?? _sharedTexture!.InternalFormat;
+        var textureId = _image?.TextureId ?? _sharedTexture!.TextureId;
+        var topLeft = _image?.Properties.TopLeftOrigin ?? false;
+        
+        using var texture = new GRBackendTexture(width, height, false,
+            new GRGlTextureInfo(GlConsts.GL_TEXTURE_2D, (uint)textureId, (uint)internalFormat));
+        
+        IBitmapImpl rv;
+        using (var surf = TryCreateSurface(textureId, internalFormat, width, height, topLeft))
+        {
+            if (surf == null)
+                throw new OpenGlException("Unable to consume provided texture");
+            rv = new ImmutableBitmap(surf.Snapshot());
+        }
+
+        _gpu.GrContext.Flush();
+        _gpu.GlContext.GlInterface.Flush();
+        return rv;
+    }
+    
+    public IBitmapImpl SnapshotWithKeyedMutex(uint acquireIndex, uint releaseIndex)
+    {
+        using (_gpu.EnsureCurrent())
+        {
+            _image.AcquireKeyedMutex(acquireIndex);
+            try
+            {
+                return TakeSnapshot();
+            }
+            finally
+            {
+                _image.ReleaseKeyedMutex(releaseIndex);
+            }
+        }
+    }
+
+    public IBitmapImpl SnapshotWithSemaphores(IPlatformRenderInterfaceImportedSemaphore waitForSemaphore,
+        IPlatformRenderInterfaceImportedSemaphore signalSemaphore)
+    {
+        var wait = (GlSkiaImportedSemaphore)waitForSemaphore;
+        var signal = (GlSkiaImportedSemaphore)signalSemaphore;
+        using (_gpu.EnsureCurrent())
+        {
+            wait.Semaphore.WaitSemaphore(_image);
+            try
+            {
+                return TakeSnapshot();
+            }
+            finally
+            {
+                signal.Semaphore.SignalSemaphore(_image);
+            }
+        }
+    }
+
+    public IBitmapImpl SnapshotWithAutomaticSync()
+    {
+        using (_gpu.EnsureCurrent())
+            return TakeSnapshot();
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
index cdba3b9ea2..bf3e950e81 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -3,19 +3,22 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Avalonia.Logging;
 using Avalonia.OpenGL;
-using Avalonia.OpenGL.Imaging;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using SkiaSharp;
+using static Avalonia.OpenGL.GlConsts;
 
 namespace Avalonia.Skia
 {
-    class GlSkiaGpu : IOpenGlAwareSkiaGpu, IOpenGlTextureSharingRenderInterfaceContextFeature
+    class GlSkiaGpu : ISkiaGpu, IOpenGlTextureSharingRenderInterfaceContextFeature
     {
         private GRContext _grContext;
         private IGlContext _glContext;
+        public GRContext GrContext => _grContext;
+        public IGlContext GlContext => _glContext;
         private List<Action> _postDisposeCallbacks = new();
         private bool? _canCreateSurfaces;
+        private IExternalObjectsRenderInterfaceContextFeature? _externalObjectsFeature;
 
         public GlSkiaGpu(IGlContext context, long? maxResourceBytes)
         {
@@ -32,6 +35,9 @@ namespace Avalonia.Skia
                         _grContext.SetResourceCacheLimit(maxResourceBytes.Value);
                     }
                 }
+
+                context.TryGetFeature<IGlContextExternalObjectsFeature>(out var externalObjects);
+                _externalObjectsFeature = new GlSkiaExternalObjectsFeature(this, externalObjects);
             }
         }
 
@@ -103,8 +109,34 @@ namespace Avalonia.Skia
         public IGlContext CreateSharedContext(IEnumerable<GlVersion> preferredVersions = null) =>
             _glContext.CreateSharedContext(preferredVersions);
 
-        public IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi) => new GlOpenGlBitmapImpl(_glContext, size, dpi);
-        
+        public ICompositionImportableOpenGlSharedTexture CreateSharedTextureForComposition(IGlContext context, PixelSize size)
+        {
+            if (!context.IsSharedWith(_glContext))
+                throw new InvalidOperationException("Contexts do not belong to the same share group");
+            
+            using (context.EnsureCurrent())
+            {
+                var gl = context.GlInterface;
+                gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out int oldTexture);
+                var tex = gl.GenTexture();
+
+                var format = context.Version.Type == GlProfileType.OpenGLES && context.Version.Major == 2
+                    ? GL_RGBA
+                    : GL_RGBA8;
+                
+                gl.BindTexture(GL_TEXTURE_2D, tex);
+                gl.TexImage2D(GL_TEXTURE_2D, 0,
+                    format, size.Width, size.Height,
+                    0, GL_RGBA, GL_UNSIGNED_BYTE, IntPtr.Zero);
+
+                gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+                gl.BindTexture(GL_TEXTURE_2D, oldTexture);
+                
+                return new GlSkiaSharedTextureForComposition(context, tex, format, size);
+            }
+        }
+
         public void Dispose()
         {
             if (_glContext.IsLost)
@@ -125,6 +157,8 @@ namespace Avalonia.Skia
         {
             if (featureType == typeof(IOpenGlTextureSharingRenderInterfaceContextFeature))
                 return this;
+            if (featureType == typeof(IExternalObjectsRenderInterfaceContextFeature))
+                return _externalObjectsFeature;
             return null;
         }
         
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaSharedTextureForComposition.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaSharedTextureForComposition.cs
new file mode 100644
index 0000000000..2d53254500
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaSharedTextureForComposition.cs
@@ -0,0 +1,44 @@
+using Avalonia.OpenGL;
+
+namespace Avalonia.Skia;
+
+internal class GlSkiaSharedTextureForComposition : ICompositionImportableOpenGlSharedTexture
+{
+    public IGlContext Context { get; }
+    private readonly object _lock = new();
+
+    public GlSkiaSharedTextureForComposition(IGlContext context, int textureId, int internalFormat, PixelSize size)
+    {
+        Context = context;
+        TextureId = textureId;
+        InternalFormat = internalFormat;
+        Size = size;
+    }
+    public void Dispose(IGlContext context)
+    {
+        lock (_lock)
+        {
+            if(TextureId == 0)
+                return;
+            try
+            {
+                using (context.EnsureCurrent())
+                    context.GlInterface.DeleteTexture(TextureId);
+            }
+            catch
+            {
+                // Ignore
+            }
+            
+            TextureId = 0;
+        }
+    }
+
+    public int TextureId { get; private set; }
+    public int InternalFormat { get; }
+    public PixelSize Size { get; }
+    public void Dispose()
+    {
+        Dispose(Context);
+    }
+}
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
deleted file mode 100644
index d8bff7cfc8..0000000000
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia.OpenGL;
-using Avalonia.OpenGL.Imaging;
-using Avalonia.Utilities;
-using SkiaSharp;
-using static Avalonia.OpenGL.GlConsts;
-
-namespace Avalonia.Skia
-{
-    class GlOpenGlBitmapImpl : IOpenGlBitmapImpl, IDrawableBitmapImpl
-    {
-        private readonly IGlContext _context;
-        private readonly object _lock = new object();
-        private IGlPresentableOpenGlSurface _surface;
-
-        public GlOpenGlBitmapImpl(IGlContext context, PixelSize pixelSize, Vector dpi)
-        {
-            _context = context;
-            PixelSize = pixelSize;
-            Dpi = dpi;
-        }
-
-        public Vector Dpi { get; }
-        public PixelSize PixelSize { get; }
-        public int Version { get; private set; }
-        public void Save(string fileName, int? quality = null) => throw new NotSupportedException();
-
-        public void Save(Stream stream, int? quality = null) => throw new NotSupportedException();
-
-        public void Draw(DrawingContextImpl context, SKRect sourceRect, SKRect destRect, SKPaint paint)
-        {
-            lock (_lock)
-            {
-                if (_surface == null)
-                    return;
-                using (_surface.Lock())
-                {
-                    using (var backendTexture = new GRBackendTexture(PixelSize.Width, PixelSize.Height, false,
-                        new GRGlTextureInfo(
-                            GlConsts.GL_TEXTURE_2D, (uint)_surface.GetTextureId(),
-                            (uint)_surface.InternalFormat)))
-                    using (var surface = SKSurface.Create(context.GrContext, backendTexture, GRSurfaceOrigin.BottomLeft,
-                        SKColorType.Rgba8888, new SKSurfaceProperties(SKPixelGeometry.RgbHorizontal)))
-                    {
-                        // Again, silently ignore, if something went wrong it's not our fault
-                        if (surface == null)
-                            return;
-
-                        using (var snapshot = surface.Snapshot())
-                            context.Canvas.DrawImage(snapshot, sourceRect, destRect, paint);
-                    }
-
-                }
-            }
-        }
-
-        public IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context, Action presentCallback)
-        {
-            if (!SupportsContext(context))
-                throw new OpenGlException("Context is not supported for texture sharing");
-            return new SharedOpenGlBitmapAttachment(this, context, presentCallback);
-        }
-
-        public bool SupportsContext(IGlContext context)
-        {
-            // TODO: negotiated platform surface sharing
-            return _context.IsSharedWith(context);
-        }
-
-        public void Dispose()
-        {
-
-        }
-
-        internal void Present(IGlPresentableOpenGlSurface surface)
-        {
-            lock (_lock)
-            {
-                _surface = surface;
-            }
-        }
-    }
-
-    interface IGlPresentableOpenGlSurface : IDisposable
-    {
-        int GetTextureId();
-        int InternalFormat { get; }
-        IDisposable Lock();
-    }
-
-    class SharedOpenGlBitmapAttachment : IOpenGlBitmapAttachment, IGlPresentableOpenGlSurface
-    {
-        private readonly GlOpenGlBitmapImpl _bitmap;
-        private readonly IGlContext _context;
-        private readonly Action _presentCallback;
-        private readonly int _fbo;
-        private readonly int _texture;
-        private readonly int _frontBuffer;
-        private bool _disposed;
-        private readonly DisposableLock _lock = new DisposableLock();
-
-        public unsafe SharedOpenGlBitmapAttachment(GlOpenGlBitmapImpl bitmap, IGlContext context, Action presentCallback)
-        {
-            _bitmap = bitmap;
-            _context = context;
-            _presentCallback = presentCallback;
-            using (_context.EnsureCurrent())
-            {
-                var glVersion = _context.Version;
-                InternalFormat = glVersion.Type == GlProfileType.OpenGLES && glVersion.Major == 2 
-                    ? GL_RGBA 
-                    : GL_RGBA8;
-                
-                _context.GlInterface.GetIntegerv(GL_FRAMEBUFFER_BINDING, out _fbo);
-                if (_fbo == 0)
-                    throw new OpenGlException("Current FBO is 0");
-
-                {
-                    var gl = _context.GlInterface;
-                    
-                    Span<int> textures = stackalloc int[2];
-                    fixed (int* ptex = textures)
-                        gl.GenTextures(2, ptex);
-                    _texture = textures[0];
-                    _frontBuffer = textures[1];
-
-                    gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
-                    foreach (var t in textures)
-                    {
-                        gl.BindTexture(GL_TEXTURE_2D, t);
-                        gl.TexImage2D(GL_TEXTURE_2D, 0,
-                            InternalFormat,
-                            _bitmap.PixelSize.Width, _bitmap.PixelSize.Height,
-                            0, GL_RGBA, GL_UNSIGNED_BYTE, IntPtr.Zero);
-
-                        gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                        gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                    }
-
-                    gl.FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture, 0);
-                    gl.BindTexture(GL_TEXTURE_2D, oldTexture);
-                }
-            }
-        }
-
-        public void Present()
-        {
-            using (_context.EnsureCurrent())
-            {
-                if (_disposed)
-                    throw new ObjectDisposedException(nameof(SharedOpenGlBitmapAttachment));
-                
-                var gl = _context.GlInterface;
-               
-                gl.Finish();
-                using (Lock())
-                {
-                    gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var oldFbo);
-                    gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
-                    gl.GetIntegerv(GL_ACTIVE_TEXTURE, out var oldActive);
-                    
-                    gl.BindFramebuffer(GL_FRAMEBUFFER, _fbo);
-                    gl.ActiveTexture(GL_TEXTURE0);
-                    gl.BindTexture(GL_TEXTURE_2D, _frontBuffer);
-
-                    gl.CopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, _bitmap.PixelSize.Width,
-                        _bitmap.PixelSize.Height);
-
-                    gl.BindFramebuffer(GL_FRAMEBUFFER, oldFbo);
-                    gl.ActiveTexture(oldActive);
-                    gl.BindTexture(GL_TEXTURE_2D, oldTexture);
-                    
-                    gl.Finish();
-                }
-            }
-            
-            _bitmap.Present(this);
-            _presentCallback();
-        }
-
-        public unsafe void Dispose()
-        {
-            var gl = _context.GlInterface;
-            _bitmap.Present(null);
-            
-            if(_disposed)
-                return;
-            using (_context.MakeCurrent())
-            using (Lock())
-            {
-                if(_disposed)
-                    return;
-                _disposed = true;
-                var ptex = stackalloc[] { _texture, _frontBuffer };
-                gl.DeleteTextures(2, ptex);
-            }
-        }
-
-        int IGlPresentableOpenGlSurface.GetTextureId()
-        {
-            return _frontBuffer;
-        }
-
-        public int InternalFormat { get; }
-
-        public IDisposable Lock() => _lock.Lock();
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
index e24d805050..802736119f 100644
--- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
+++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
@@ -37,6 +37,13 @@ namespace Avalonia.Skia
             }
         }
 
+        public ImmutableBitmap(SKImage image)
+        {
+            _image = image;
+            PixelSize = new PixelSize(image.Width, image.Height);
+            Dpi = new Vector(96, 96);
+        }
+
         public ImmutableBitmap(ImmutableBitmap src, PixelSize destinationSize, BitmapInterpolationMode interpolationMode)
         {
             SKImageInfo info = new SKImageInfo(destinationSize.Width, destinationSize.Height, SKColorType.Bgra8888);
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index b202b60cdf..b4297a7c33 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -1,16 +1,11 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading;
-
-using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Media;
 using Avalonia.OpenGL;
-using Avalonia.OpenGL.Imaging;
 using Avalonia.Platform;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -86,11 +81,11 @@ namespace Avalonia.Skia
 
             SKPath path = new SKPath();
 
-            var (currentX, currentY) = glyphRun.BaselineOrigin;
+            var (currentX, currentY) = glyphRun.PlatformImpl.Item.BaselineOrigin;
 
-            for (var i = 0; i < glyphRun.GlyphIndices.Count; i++)
+            for (var i = 0; i < glyphRun.GlyphInfos.Count; i++)
             {
-                var glyph = glyphRun.GlyphIndices[i];
+                var glyph = glyphRun.GlyphInfos[i].GlyphIndex;
                 var glyphPath = skFont.GetGlyphPath(glyph);
 
                 if (!glyphPath.IsEmpty)
@@ -98,14 +93,7 @@ namespace Avalonia.Skia
                     path.AddPath(glyphPath, (float)currentX, (float)currentY);
                 }
 
-                if (glyphRun.GlyphAdvances != null)
-                {
-                    currentX += glyphRun.GlyphAdvances[i];
-                }
-                else
-                {
-                    currentX += glyphPath.Bounds.Right;
-                }
+                currentX += glyphRun.GlyphInfos[i].GlyphAdvance;
             }
 
             return new StreamGeometryImpl(path);
@@ -213,17 +201,20 @@ namespace Avalonia.Skia
             return new WriteableBitmapImpl(size, dpi, format, alphaFormat);
         }
 
-        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices,
-            IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        public IGlyphRunImpl CreateGlyphRun(
+            IGlyphTypeface glyphTypeface,
+            double fontRenderingEmSize, 
+            IReadOnlyList<GlyphInfo> glyphInfos,
+            Point baselineOrigin)
         {
             if (glyphTypeface == null)
             {
                 throw new ArgumentNullException(nameof(glyphTypeface));
             }
 
-            if (glyphIndices == null)
+            if (glyphInfos == null)
             {
-                throw new ArgumentNullException(nameof(glyphIndices));
+                throw new ArgumentNullException(nameof(glyphInfos));
             }
 
             var glyphTypefaceImpl = glyphTypeface as GlyphTypefaceImpl;
@@ -242,62 +233,31 @@ namespace Avalonia.Skia
 
             var builder = new SKTextBlobBuilder();
 
-            var count = glyphIndices.Count;
+            var count = glyphInfos.Count;
 
-            if (glyphOffsets != null && glyphAdvances != null)
-            {
-                var runBuffer = builder.AllocatePositionedRun(font, count);
+            var runBuffer = builder.AllocatePositionedRun(font, count);
 
-                var glyphSpan = runBuffer.GetGlyphSpan();
-                var positionSpan = runBuffer.GetPositionSpan();
+            var glyphSpan = runBuffer.GetGlyphSpan();
+            var positionSpan = runBuffer.GetPositionSpan();
 
-                var currentX = 0.0;
+            var width = 0.0;
 
-                for (int i = 0; i < glyphOffsets.Count; i++)
-                {
-                    var offset = glyphOffsets[i];
-
-                    glyphSpan[i] = glyphIndices[i];
-
-                    positionSpan[i] = new SKPoint((float)(currentX + offset.X), (float)offset.Y);
-
-                    currentX += glyphAdvances[i];
-                }
-            }
-            else
+            for (int i = 0; i < count; i++)
             {
-                if (glyphAdvances != null)
-                {
-                    var runBuffer = builder.AllocateHorizontalRun(font, count, 0);
+                var glyphInfo = glyphInfos[i];
+                var offset = glyphInfo.GlyphOffset;
 
-                    var glyphSpan = runBuffer.GetGlyphSpan();
-                    var positionSpan = runBuffer.GetPositionSpan();
+                glyphSpan[i] = glyphInfo.GlyphIndex;
 
-                    var currentX = 0.0;
+                positionSpan[i] = new SKPoint((float)(width + offset.X), (float)offset.Y);
 
-                    for (int i = 0; i < glyphAdvances.Count; i++)
-                    {
-                        glyphSpan[i] = glyphIndices[i];
-
-                        positionSpan[i] = (float)currentX;
-
-                        currentX += glyphAdvances[i];
-                    }
-                }
-                else
-                {
-                    var runBuffer = builder.AllocateRun(font, count, 0, 0);
-
-                    var glyphSpan = runBuffer.GetGlyphSpan();
-
-                    for (int i = 0; i < glyphIndices.Count; i++)
-                    {
-                        glyphSpan[i] = glyphIndices[i];
-                    }
-                }
+                width += glyphInfo.GlyphAdvance;
             }
 
-            return new GlyphRunImpl(builder.Build());
+            var scale = fontRenderingEmSize / glyphTypeface.Metrics.DesignEmHeight;
+            var height = glyphTypeface.Metrics.LineSpacing * scale;
+
+            return new GlyphRunImpl(builder.Build(), new Size(width, height), baselineOrigin);
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/SkiaBackendContext.cs b/src/Skia/Avalonia.Skia/SkiaBackendContext.cs
index 4949f4a50d..0cf66767cb 100644
--- a/src/Skia/Avalonia.Skia/SkiaBackendContext.cs
+++ b/src/Skia/Avalonia.Skia/SkiaBackendContext.cs
@@ -43,5 +43,7 @@ internal class SkiaContext : IPlatformRenderInterfaceContext
             "Don't know how to create a Skia render target from any of provided surfaces");
     }
 
+    public bool IsLost => _gpu.IsLost;
+
     public object TryGetFeature(Type featureType) => _gpu?.TryGetFeature(featureType);
-}
\ No newline at end of file
+}
diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index e0f95bac60..e1a6b93692 100644
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -52,6 +52,8 @@ namespace Avalonia.Skia
 
                 var shapedBuffer = new ShapedBuffer(text, bufferLength, typeface, fontRenderingEmSize, bidiLevel);
 
+                var targetInfos = shapedBuffer.GlyphInfos;
+
                 var glyphInfos = buffer.GetGlyphInfoSpan();
 
                 var glyphPositions = buffer.GetGlyphPositionSpan();
@@ -77,9 +79,7 @@ namespace Avalonia.Skia
                             4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
                     }
 
-                    var targetInfo = new Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
-
-                    shapedBuffer[i] = targetInfo;
+                    targetInfos[i] = new Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
                 }
 
                 return shapedBuffer;
@@ -161,6 +161,8 @@ namespace Avalonia.Skia
 
             if (MemoryMarshal.TryGetArray(memory, out var segment))
             {
+                start = segment.Offset;
+                length = segment.Count;
                 return segment.Array.AsMemory();
             }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 5887ba2172..fbf8097ece 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -7,6 +7,7 @@ using Avalonia.Direct2D1.Media;
 using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
 using SharpDX.DirectWrite;
 using GlyphRun = Avalonia.Media.GlyphRun;
@@ -157,12 +158,12 @@ namespace Avalonia.Direct2D1
         public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children) => new GeometryGroupImpl(fillRule, children);
         public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2) => new CombinedGeometryImpl(combineMode, g1, g2);
 
-        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, 
-            IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, 
+            IReadOnlyList<GlyphInfo> glyphInfos, Point baselineOrigin)
         {
             var glyphTypefaceImpl = (GlyphTypefaceImpl)glyphTypeface;
 
-            var glyphCount = glyphIndices.Count;
+            var glyphCount = glyphInfos.Count;
 
             var run = new SharpDX.DirectWrite.GlyphRun
             {
@@ -174,44 +175,29 @@ namespace Avalonia.Direct2D1
 
             for (var i = 0; i < glyphCount; i++)
             {
-                indices[i] = (short)glyphIndices[i];
+                indices[i] = (short)glyphInfos[i].GlyphIndex;
             }
 
             run.Indices = indices;
 
             run.Advances = new float[glyphCount];
 
-            var scale = (float)(fontRenderingEmSize / glyphTypeface.Metrics.DesignEmHeight);
+            var width = 0.0;
 
-            if (glyphAdvances == null)
+            for (var i = 0; i < glyphCount; i++)
             {
-                for (var i = 0; i < glyphCount; i++)
-                {
-                    var advance = glyphTypeface.GetGlyphAdvance(glyphIndices[i]) * scale;
+                var advance = glyphInfos[i].GlyphAdvance;
 
-                    run.Advances[i] = advance;
-                }
-            }
-            else
-            {
-                for (var i = 0; i < glyphCount; i++)
-                {
-                    var advance = (float)glyphAdvances[i];
+                width += advance;
 
-                    run.Advances[i] = advance;
-                }
-            }
-
-            if (glyphOffsets == null)
-            {
-                return new GlyphRunImpl(run);
+                run.Advances[i] = (float)advance;
             }
 
             run.Offsets = new GlyphOffset[glyphCount];
 
             for (var i = 0; i < glyphCount; i++)
             {
-                var (x, y) = glyphOffsets[i];
+                var (x, y) = glyphInfos[i].GlyphOffset;
 
                 run.Offsets[i] = new GlyphOffset
                 {
@@ -220,7 +206,10 @@ namespace Avalonia.Direct2D1
                 };
             }
 
-            return new GlyphRunImpl(run);
+            var scale = fontRenderingEmSize / glyphTypeface.Metrics.DesignEmHeight;
+            var height = glyphTypeface.Metrics.LineSpacing * scale;
+
+            return new GlyphRunImpl(run, new Size(width, height), baselineOrigin);
         }
 
         class D2DApi : IPlatformRenderInterfaceContext
@@ -238,6 +227,7 @@ namespace Avalonia.Direct2D1
             }
 
             public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces) => _platform.CreateRenderTarget(surfaces);
+            public bool IsLost => false;
         }
 
         public IPlatformRenderInterfaceContext CreateBackendContext(IPlatformGraphicsContext graphicsContext) =>
@@ -254,11 +244,12 @@ namespace Avalonia.Direct2D1
 
             using (var sink = pathGeometry.Open())
             {
-                var glyphs = new short[glyphRun.GlyphIndices.Count];
+                var glyphInfos = glyphRun.GlyphInfos;
+                var glyphs = new short[glyphInfos.Count];
 
-                for (int i = 0; i < glyphRun.GlyphIndices.Count; i++)
+                for (int i = 0; i < glyphInfos.Count; i++)
                 {
-                    glyphs[i] = (short)glyphRun.GlyphIndices[i];
+                    glyphs[i] = (short)glyphInfos[i].GlyphIndex;
                 }
 
                 glyphTypeface.FontFace.GetGlyphRunOutline((float)glyphRun.FontRenderingEmSize, glyphs, null, null, false, !glyphRun.IsLeftToRight, sink);
@@ -266,7 +257,7 @@ namespace Avalonia.Direct2D1
                 sink.Close();
             }
 
-            var (baselineOriginX, baselineOriginY) = glyphRun.BaselineOrigin;
+            var (baselineOriginX, baselineOriginY) = glyphRun.PlatformImpl.Item.BaselineOrigin;
 
             var transformedGeometry = new SharpDX.Direct2D1.TransformedGeometry(
                 Direct2D1Factory,
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 3f2298eb22..d5d6cd8c29 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -390,13 +390,13 @@ namespace Avalonia.Direct2D1.Media
         /// </summary>
         /// <param name="foreground">The foreground.</param>
         /// <param name="glyphRun">The glyph run.</param>
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
         {
-            using (var brush = CreateBrush(foreground, glyphRun.Size))
+            using (var brush = CreateBrush(foreground, glyphRun.Item.Size))
             {
-                var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
+                var glyphRunImpl = (GlyphRunImpl)glyphRun.Item;
 
-                _renderTarget.DrawGlyphRun(glyphRun.BaselineOrigin.ToSharpDX(), glyphRunImpl.GlyphRun,
+                _renderTarget.DrawGlyphRun(glyphRun.Item.BaselineOrigin.ToSharpDX(), glyphRunImpl.GlyphRun,
                     brush.PlatformBrush, MeasuringMode.Natural);
             }
         }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs
index 67418613a4..24b8fc04b3 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs
@@ -1,20 +1,26 @@
 using System.Collections.Generic;
 using Avalonia.Platform;
+using SharpDX.DirectWrite;
 
 namespace Avalonia.Direct2D1.Media
 {
     internal class GlyphRunImpl : IGlyphRunImpl
     {
-        public GlyphRunImpl(SharpDX.DirectWrite.GlyphRun glyphRun)
+        public GlyphRunImpl(GlyphRun glyphRun, Size size, Point baselineOrigin)
         {
+            Size = size;
+            BaselineOrigin = baselineOrigin;
             GlyphRun = glyphRun;
         }
 
-        public SharpDX.DirectWrite.GlyphRun GlyphRun { get; }
+        public Size Size { get; }
+
+        public Point BaselineOrigin { get; }
+
+        public GlyphRun GlyphRun { get; }
 
         public void Dispose()
         {
-            //SharpDX already handles this.
             //GlyphRun?.Dispose();
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
index fffa5ce490..ff0fff6b14 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
@@ -52,6 +52,8 @@ namespace Avalonia.Direct2D1.Media
 
                 var shapedBuffer = new ShapedBuffer(text, bufferLength, typeface, fontRenderingEmSize, bidiLevel);
 
+                var targetInfos = shapedBuffer.GlyphInfos;
+
                 var glyphInfos = buffer.GetGlyphInfoSpan();
 
                 var glyphPositions = buffer.GetGlyphPositionSpan();
@@ -77,9 +79,7 @@ namespace Avalonia.Direct2D1.Media
                             4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
                     }
 
-                    var targetInfo = new Avalonia.Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
-
-                    shapedBuffer[i] = targetInfo;
+                    targetInfos[i] = new Avalonia.Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
                 }
 
                 return shapedBuffer;
@@ -161,6 +161,8 @@ namespace Avalonia.Direct2D1.Media
 
             if (MemoryMarshal.TryGetArray(memory, out var segment))
             {
+                start = segment.Offset;
+                length = segment.Count;
                 return segment.Array.AsMemory();
             }
 
diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs
index a749ed1b45..1357e8aa63 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs
@@ -52,6 +52,44 @@ namespace Avalonia.Win32.DirectX
 
         D3D11_USAGE_STAGING = 3,
     }
+    
+    [Flags]
+    internal enum D3D11_RESOURCE_MISC_FLAG
+    {
+        D3D11_RESOURCE_MISC_GENERATE_MIPS                   = 0x00000001,
+        D3D11_RESOURCE_MISC_SHARED                          = 0x00000002,
+        D3D11_RESOURCE_MISC_TEXTURECUBE                     = 0x00000004,
+        D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS               = 0x00000010,
+        D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS          = 0x00000020,
+        D3D11_RESOURCE_MISC_BUFFER_STRUCTURED               = 0x00000040,
+        D3D11_RESOURCE_MISC_RESOURCE_CLAMP                  = 0x00000080,
+        D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX               = 0x00000100,
+        D3D11_RESOURCE_MISC_GDI_COMPATIBLE                  = 0x00000200,
+        D3D11_RESOURCE_MISC_SHARED_NTHANDLE                 = 0x00000800,
+        D3D11_RESOURCE_MISC_RESTRICTED_CONTENT              = 0x00001000,
+        D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE        = 0x00002000,
+        D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x00004000,
+        D3D11_RESOURCE_MISC_GUARDED                         = 0x00008000,
+        D3D11_RESOURCE_MISC_TILE_POOL                       = 0x00020000,
+        D3D11_RESOURCE_MISC_TILED                           = 0x00040000,
+        D3D11_RESOURCE_MISC_HW_PROTECTED                    = 0x00080000,
+    }
+    
+    [Flags]
+    internal enum D3D11_BIND_FLAG
+    {
+        D3D11_BIND_VERTEX_BUFFER = 0x00000001,
+        D3D11_BIND_INDEX_BUFFER = 0x00000002,
+        D3D11_BIND_CONSTANT_BUFFER = 0x00000004,
+        D3D11_BIND_SHADER_RESOURCE = 0x00000008,
+        D3D11_BIND_STREAM_OUTPUT = 0x00000010,
+        D3D11_BIND_RENDER_TARGET = 0x00000020,
+        D3D11_BIND_DEPTH_STENCIL = 0x00000040,
+        D3D11_BIND_UNORDERED_ACCESS = 0x00000080,
+        D3D11_BIND_DECODER = 0x00000200,
+        D3D11_BIND_VIDEO_ENCODER = 0x00000400,
+    }
+    
     internal enum DXGI_SWAP_EFFECT
     {
         DXGI_SWAP_EFFECT_DISCARD = 0,
diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
index 47451831a6..c11a6026e7 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
@@ -282,11 +282,11 @@ namespace Avalonia.Win32.DirectX
 
         public D3D11_USAGE Usage;
 
-        public uint BindFlags;
+        public D3D11_BIND_FLAG BindFlags;
 
         public uint CPUAccessFlags;
 
-        public uint MiscFlags;
+        public D3D11_RESOURCE_MISC_FLAG MiscFlags;
     }
 #nullable restore
 }
diff --git a/src/Windows/Avalonia.Win32/DirectX/directx.idl b/src/Windows/Avalonia.Win32/DirectX/directx.idl
index a4552eedea..1d66c898db 100644
--- a/src/Windows/Avalonia.Win32/DirectX/directx.idl
+++ b/src/Windows/Avalonia.Win32/DirectX/directx.idl
@@ -10,6 +10,7 @@
 @clr-map SIZE Avalonia.Win32.Interop.UnmanagedMethods.SIZE
 @clr-map POINT Avalonia.Win32.Interop.UnmanagedMethods.POINT
 @clr-map HWND IntPtr
+@clr-map HANDLE IntPtr
 @clr-map BOOL int
 @clr-map DWORD int
 @clr-map SIZE_T IntPtr
@@ -259,10 +260,28 @@ interface IDXGISurface : IDXGIDeviceSubObject
     HRESULT Unmap();
 }
 
+[uuid( 035f3ab4-482e-4e50-b41f-8a7f8bd8960b)]
+interface IDXGIResource : IDXGIDeviceSubObject
+{
+    HRESULT GetSharedHandle( [out, annotation("_Out_")] HANDLE * pSharedHandle );
+    HRESULT GetUsage( [out] DXGI_USAGE * pUsage );
+    HRESULT SetEvictionPriority( [in] UINT EvictionPriority );
+    HRESULT GetEvictionPriority( [out, retval, annotation("_Out_")] UINT* pEvictionPriority );
+};
+
+
+[ uuid( 9d8e1289-d7b3-465f-8126-250e349af85d)]
+interface IDXGIKeyedMutex :
+    IDXGIDeviceSubObject
+{
+    HRESULT AcquireSync( [in] UINT64 Key, [in] uint dwMilliseconds);
+    HRESULT ReleaseSync( [in] UINT64 Key);
+};
+
 [uuid(770aae78-f26f-4dba-a829-253c83d1b387)]
 interface IDXGIFactory1 : IDXGIFactory
 {
-    HRESULT EnumAdapters1([in] UINT Adapter, [out, annotation("_COM_Outptr_")] IDXGIAdapter1** ppAdapter);
+    int EnumAdapters1([in] UINT Adapter, [out] void** ppAdapter);
     BOOL IsCurrent();
 }
 
@@ -339,9 +358,9 @@ interface ID3D11Device : IUnknown
         IntPtr pInitialData,
         [out, retval] IUnknown**  ppTexture1D );
     HRESULT CreateTexture2D(
-        IntPtr  pDesc,
+        D3D11_TEXTURE2D_DESC*  pDesc,
         IntPtr pInitialData,
-        [out, retval] IUnknown**  ppTexture2D );
+        [out, retval] ID3D11Texture2D**  ppTexture2D );
     HRESULT CreateTexture3D(
         IntPtr pDesc,
         IntPtr pInitialData,
@@ -481,3 +500,11 @@ interface ID3D11Device : IUnknown
     HRESULT SetExceptionMode( UINT RaiseFlags );
     UINT GetExceptionMode();
 }
+
+
+[uuid( 6f15aaf2-d208-4e89-9ab4-489535d34f9c)]
+interface ID3D11Texture2D : IUnknown
+{
+    // Just a marker interface for now
+};
+
diff --git a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleExternalD3D11Texture2D.cs b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleExternalD3D11Texture2D.cs
new file mode 100644
index 0000000000..b0fa76fda2
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleExternalD3D11Texture2D.cs
@@ -0,0 +1,107 @@
+#nullable enable
+using System;
+using System.Threading;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.Platform;
+using Avalonia.Win32.DirectX;
+using MicroCom.Runtime;
+using static Avalonia.OpenGL.Egl.EglConsts;
+using static Avalonia.OpenGL.GlConsts;
+
+namespace Avalonia.Win32.OpenGl.Angle;
+
+internal class AngleExternalMemoryD3D11Texture2D : IGlExternalImageTexture
+{
+    private readonly EglContext _context;
+    private ID3D11Texture2D _texture2D;
+    private EglSurface _eglSurface;
+    private IDXGIKeyedMutex _mutex;
+
+    public unsafe AngleExternalMemoryD3D11Texture2D(EglContext context, ID3D11Texture2D texture2D, PlatformGraphicsExternalImageProperties props)
+    {
+        _context = context;
+        _texture2D = texture2D.CloneReference();
+        _mutex = _texture2D.QueryInterface<IDXGIKeyedMutex>();
+        Properties = props;
+
+        InternalFormat = GL_RGBA8;
+
+        _eglSurface = _context.Display.CreatePBufferFromClientBuffer(EGL_D3D_TEXTURE_ANGLE, texture2D.GetNativeIntPtr(),
+            new[]
+            {
+                EGL_WIDTH, props.Width, EGL_HEIGHT, props.Height, EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,
+                EGL_TEXTURE_TARGET, EGL_TEXTURE_2D, EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_RGBA, EGL_NONE, EGL_NONE,
+                EGL_NONE
+            });
+        
+        var gl = _context.GlInterface;
+        int temp = 0;
+        gl.GenTextures(1, &temp);
+        TextureId = temp;
+        gl.BindTexture(GlConsts.GL_TEXTURE_2D, TextureId);
+
+        if (_context.Display.EglInterface.BindTexImage(_context.Display.Handle, _eglSurface.DangerousGetHandle(),
+                EGL_BACK_BUFFER) == 0)
+            
+            throw OpenGlException.GetFormattedException("eglBindTexImage", _context.Display.EglInterface);
+    }
+    
+    public void Dispose()
+    {
+        
+        if (!_context.IsLost && TextureId != 0)
+            using (_context.EnsureCurrent())
+                _context.GlInterface.DeleteTexture(TextureId);
+        TextureId = 0;
+        _eglSurface?.Dispose();
+        _eglSurface = null!;
+        _texture2D?.Dispose();
+        _texture2D = null!;
+        _mutex?.Dispose();
+        _mutex = null!;
+    }
+
+
+    public void AcquireKeyedMutex(uint key) => _mutex.AcquireSync(key, int.MaxValue);
+
+    public void ReleaseKeyedMutex(uint key) => _mutex.ReleaseSync(key);
+
+    public int TextureId { get; private set; }
+    public int InternalFormat { get; }
+    public PlatformGraphicsExternalImageProperties Properties { get; }
+}
+
+internal class AngleExternalMemoryD3D11ExportedTexture2D : AngleExternalMemoryD3D11Texture2D, IGlExportableExternalImageTexture
+{
+    static IPlatformHandle GetHandle(ID3D11Texture2D texture2D)
+    {
+        using var resource = texture2D.QueryInterface<IDXGIResource>();
+        return new PlatformHandle(resource.SharedHandle,
+            KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle);
+    }
+
+    public AngleExternalMemoryD3D11ExportedTexture2D(EglContext context, ID3D11Texture2D texture2D,
+        D3D11_TEXTURE2D_DESC desc,
+        PlatformGraphicsExternalImageFormat format)
+        : this(context, texture2D, GetHandle(texture2D),
+            new PlatformGraphicsExternalImageProperties
+            {
+                Width = (int)desc.Width, Height = (int)desc.Height, Format = format
+            })
+    {
+
+    }
+
+    private AngleExternalMemoryD3D11ExportedTexture2D(EglContext context, ID3D11Texture2D texture2D,
+        IPlatformHandle handle, PlatformGraphicsExternalImageProperties properties) 
+        : base(context, texture2D, properties)
+    {
+        Handle = handle;
+    }
+
+    public IPlatformHandle Handle { get; }
+    public IPlatformHandle GetHandle() => Handle;
+
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleExternalObjectsFeature.cs b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleExternalObjectsFeature.cs
new file mode 100644
index 0000000000..a7b52e953e
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleExternalObjectsFeature.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls.Documents;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using Avalonia.Win32.DirectX;
+using MicroCom.Runtime;
+
+namespace Avalonia.Win32.OpenGl.Angle;
+
+internal class AngleExternalObjectsFeature : IGlContextExternalObjectsFeature, IDisposable
+{
+    private readonly EglContext _context;
+    private readonly ID3D11Device _device;
+
+    public AngleExternalObjectsFeature(EglContext context)
+    {
+        _context = context;
+        var angle = (AngleWin32EglDisplay)context.Display;
+        _device = MicroComRuntime.CreateProxyFor<ID3D11Device>(angle.GetDirect3DDevice(), false).CloneReference();
+        using var dxgiDevice = _device.QueryInterface<IDXGIDevice>();
+        using var adapter = dxgiDevice.Adapter;
+        DeviceLuid = BitConverter.GetBytes(adapter.Desc.AdapterLuid);
+    }
+
+    public IReadOnlyList<string> SupportedImportableExternalImageTypes { get; } = new[]
+    {
+        KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle
+    };
+
+    public IReadOnlyList<string> SupportedExportableExternalImageTypes => SupportedImportableExternalImageTypes;
+    public IReadOnlyList<string> SupportedImportableExternalSemaphoreTypes => Array.Empty<string>();
+    public IReadOnlyList<string> SupportedExportableExternalSemaphoreTypes => Array.Empty<string>();
+
+    public IReadOnlyList<PlatformGraphicsExternalImageFormat> GetSupportedFormatsForExternalMemoryType(string type) =>
+        new[]
+        {
+            PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm
+        };
+
+    public unsafe IGlExportableExternalImageTexture CreateImage(string type, PixelSize size, 
+        PlatformGraphicsExternalImageFormat format)
+    {
+        if (format != PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm)
+            throw new NotSupportedException("Unsupported external memory format");
+        using (_context.EnsureCurrent())
+        {
+            var fmt = DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UNORM;
+
+            var desc = new D3D11_TEXTURE2D_DESC
+            {
+                Format = fmt,
+                Width = (uint)size.Width,
+                Height = (uint)size.Height,
+                ArraySize = 1,
+                MipLevels = 1,
+                SampleDesc = new DXGI_SAMPLE_DESC { Count = 1, Quality = 0 },
+                Usage = D3D11_USAGE.D3D11_USAGE_DEFAULT,
+                CPUAccessFlags = 0,
+                MiscFlags = D3D11_RESOURCE_MISC_FLAG.D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX,
+                BindFlags = D3D11_BIND_FLAG.D3D11_BIND_RENDER_TARGET | D3D11_BIND_FLAG.D3D11_BIND_SHADER_RESOURCE,
+            };
+            using var texture = _device.CreateTexture2D(&desc, IntPtr.Zero);
+            return new AngleExternalMemoryD3D11ExportedTexture2D(_context, texture, desc, format);
+        }
+    }
+
+    public IGlExportableExternalImageTexture CreateSemaphore(string type) => throw new NotSupportedException();
+
+    public unsafe IGlExternalImageTexture ImportImage(IPlatformHandle handle, PlatformGraphicsExternalImageProperties properties)
+    {
+        if (handle.HandleDescriptor != KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle)
+            throw new NotSupportedException("Unsupported external memory type");
+        
+        using (_context.EnsureCurrent())
+        {
+            var guid = MicroComRuntime.GetGuidFor(typeof(ID3D11Texture2D));
+            using var opened = _device.OpenSharedResource(handle.Handle, &guid);
+            using var texture = opened.QueryInterface<ID3D11Texture2D>();
+            return new AngleExternalMemoryD3D11Texture2D(_context, texture, properties);
+        }
+    }
+
+    public IGlExternalSemaphore ImportSemaphore(IPlatformHandle handle) => throw new NotSupportedException();
+    public CompositionGpuImportedImageSynchronizationCapabilities GetSynchronizationCapabilities(string imageHandleType)
+    {
+        if (imageHandleType == KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureGlobalSharedHandle
+            || imageHandleType == KnownPlatformGraphicsExternalImageHandleTypes.D3D11TextureNtHandle)
+            return CompositionGpuImportedImageSynchronizationCapabilities.KeyedMutex;
+        return default;
+    }
+
+    public byte[] DeviceLuid { get; }
+    public byte[] DeviceUuid { get; }
+
+    public void Dispose()
+    {
+        _device.Dispose();
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32EglDisplay.cs b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32EglDisplay.cs
index b2d7b2014b..53bf2fb8b1 100644
--- a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32EglDisplay.cs
+++ b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32EglDisplay.cs
@@ -1,5 +1,8 @@
+#nullable enable annotations
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Angle;
@@ -7,6 +10,7 @@ using Avalonia.OpenGL.Egl;
 using Avalonia.Win32.DirectX;
 using MicroCom.Runtime;
 using static Avalonia.OpenGL.Egl.EglConsts;
+// ReSharper disable SimplifyLinqExpressionUseMinByAndMaxBy
 
 namespace Avalonia.Win32.OpenGl.Angle
 {
@@ -40,51 +44,90 @@ namespace Avalonia.Win32.OpenGl.Angle
             }, AngleOptions.PlatformApi.DirectX11);
         }
 
-        public static AngleWin32EglDisplay CreateD3D11Display(Win32AngleEglInterface egl)
+        public static unsafe AngleWin32EglDisplay CreateD3D11Display(Win32AngleEglInterface egl,
+            bool preferDiscreteAdapter = false)
         {
-            unsafe
+            var featureLevels = new[]
             {
-                var featureLevels = new[]
-                {
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_11_1,
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_11_0,
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_10_1,
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_10_0,
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_9_3,
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_9_2,
-                    D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_9_1
-                };
-
-                DirectXUnmanagedMethods.D3D11CreateDevice(IntPtr.Zero, D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_HARDWARE,
-                    IntPtr.Zero, 0, featureLevels, (uint)featureLevels.Length,
-                    7, out var pD3dDevice, out var featureLevel, null);
-                if (pD3dDevice == IntPtr.Zero)
-                    throw new Win32Exception("Unable to create D3D11 Device");
+                D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_11_0,
+                D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_10_0,
+                D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_9_3, D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_9_2,
+                D3D_FEATURE_LEVEL.D3D_FEATURE_LEVEL_9_1
+            };
 
-                var d3dDevice = MicroComRuntime.CreateProxyFor<ID3D11Device>(pD3dDevice, true);
-                var angleDevice = IntPtr.Zero;
-                var display = IntPtr.Zero;
+            var dxgiFactoryGuid = MicroComRuntime.GetGuidFor(typeof(IDXGIFactory1));
+            DirectXUnmanagedMethods.CreateDXGIFactory1(ref dxgiFactoryGuid, out var pDxgiFactory);
+            IDXGIAdapter1? chosenAdapter = null;
+            if (pDxgiFactory != null)
+            {
+                using var factory = MicroComRuntime.CreateProxyFor<IDXGIFactory1>(pDxgiFactory, true);
 
-                void Cleanup()
+                void* pAdapter = null;
+                if (preferDiscreteAdapter)
                 {
-                    if (angleDevice != IntPtr.Zero)
-                        egl.ReleaseDeviceANGLE(angleDevice);
-                    d3dDevice.Dispose();
+                    ushort adapterIndex = 0;
+                    var adapters = new List<(IDXGIAdapter1 adapter, string name)>();
+                    while (factory.EnumAdapters1(adapterIndex, &pAdapter) == 0)
+                    {
+                        var adapter = MicroComRuntime.CreateProxyFor<IDXGIAdapter1>(pAdapter, true);
+                        var desc = adapter.Desc1;
+                        var name = Marshal.PtrToStringUni(new IntPtr(desc.Description))!.ToLowerInvariant();
+                        adapters.Add((adapter, name));
+                        adapterIndex++;
+                    }
+
+                    if (adapters.Count == 0)
+                        throw new OpenGlException("No adapters found");
+                    chosenAdapter = adapters
+                        .OrderByDescending(x => x.name.Contains("nvidia") ? 2 : x.name.Contains("amd") ? 1 : 0)
+                        .First().adapter.CloneReference();
+                    foreach (var a in adapters)
+                        a.adapter.Dispose();
                 }
-                
-                bool success = false;
-                try
+                else
                 {
-                    angleDevice = egl.CreateDeviceANGLE(EGL_D3D11_DEVICE_ANGLE, pD3dDevice, null);
-                    if (angleDevice == IntPtr.Zero)
-                        throw OpenGlException.GetFormattedException("eglCreateDeviceANGLE", egl);
+                    if (factory.EnumAdapters1(0, &pAdapter) != 0)
+                        throw new OpenGlException("No adapters found");
+                    chosenAdapter = MicroComRuntime.CreateProxyFor<IDXGIAdapter1>(pAdapter, true);
+                }
+            }
+
+            IntPtr pD3dDevice;
+            using (chosenAdapter)
+                DirectXUnmanagedMethods.D3D11CreateDevice(chosenAdapter?.GetNativeIntPtr() ?? IntPtr.Zero,
+                    D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_UNKNOWN,
+                    IntPtr.Zero, 0, featureLevels, (uint)featureLevels.Length,
+                    7, out pD3dDevice, out var featureLevel, null);
+
 
-                    display = egl.GetPlatformDisplayExt(EGL_PLATFORM_DEVICE_EXT, angleDevice, null);
-                    if (display == IntPtr.Zero)
-                        throw OpenGlException.GetFormattedException("eglGetPlatformDisplayEXT", egl);
+            if (pD3dDevice == IntPtr.Zero)
+                throw new Win32Exception("Unable to create D3D11 Device");
 
+            var d3dDevice = MicroComRuntime.CreateProxyFor<ID3D11Device>(pD3dDevice, true);
+            var angleDevice = IntPtr.Zero;
+            var display = IntPtr.Zero;
 
-                    var rv = new AngleWin32EglDisplay(display, new EglDisplayOptions
+            void Cleanup()
+            {
+                if (angleDevice != IntPtr.Zero)
+                    egl.ReleaseDeviceANGLE(angleDevice);
+                d3dDevice.Dispose();
+            }
+
+            bool success = false;
+            try
+            {
+                angleDevice = egl.CreateDeviceANGLE(EGL_D3D11_DEVICE_ANGLE, pD3dDevice, null);
+                if (angleDevice == IntPtr.Zero)
+                    throw OpenGlException.GetFormattedException("eglCreateDeviceANGLE", egl);
+
+                display = egl.GetPlatformDisplayExt(EGL_PLATFORM_DEVICE_EXT, angleDevice, null);
+                if (display == IntPtr.Zero)
+                    throw OpenGlException.GetFormattedException("eglGetPlatformDisplayEXT", egl);
+
+
+                var rv = new AngleWin32EglDisplay(display,
+                    new EglDisplayOptions
                     {
                         DisposeCallback = Cleanup,
                         Egl = egl,
@@ -92,17 +135,16 @@ namespace Avalonia.Win32.OpenGl.Angle
                         DeviceLostCheckCallback = () => d3dDevice.DeviceRemovedReason != 0,
                         GlVersions = AvaloniaLocator.Current.GetService<AngleOptions>()?.GlProfiles
                     }, AngleOptions.PlatformApi.DirectX11);
-                    success = true;
-                    return rv;
-                }
-                finally
+                success = true;
+                return rv;
+            }
+            finally
+            {
+                if (!success)
                 {
-                    if (!success)
-                    {
-                        if (display != IntPtr.Zero)
-                            egl.Terminate(display);
-                        Cleanup();
-                    }
+                    if (display != IntPtr.Zero)
+                        egl.Terminate(display);
+                    Cleanup();
                 }
             }
         }
diff --git a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32PlatformGraphics.cs b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32PlatformGraphics.cs
index 9a829aff92..a4d1ea457a 100644
--- a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32PlatformGraphics.cs
+++ b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32PlatformGraphics.cs
@@ -9,7 +9,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Win32.OpenGl.Angle;
 
-internal class AngleWin32PlatformGraphics : IPlatformGraphics
+internal class AngleWin32PlatformGraphics : IPlatformGraphics, IPlatformGraphicsOpenGlContextFactory
 {
     private readonly Win32AngleEglInterface _egl;
     private AngleWin32EglDisplay _sharedDisplay;
@@ -29,9 +29,10 @@ internal class AngleWin32PlatformGraphics : IPlatformGraphics
             var rv = display.CreateContext(new EglContextOptions
             {
                 DisposeCallback = display.Dispose,
-                ExtraFeatures = new Dictionary<Type, object>
+                ExtraFeatures = new Dictionary<Type, Func<EglContext, object>>
                 {
-                    [typeof(IGlPlatformSurfaceRenderTargetFactory)] = new AngleD3DTextureFeature()
+                    [typeof(IGlPlatformSurfaceRenderTargetFactory)] = _ => new AngleD3DTextureFeature(),
+                    [typeof(IGlContextExternalObjectsFeature)] = context => new AngleExternalObjectsFeature(context)
                 }
             });
             success = true;
@@ -73,8 +74,6 @@ internal class AngleWin32PlatformGraphics : IPlatformGraphics
 
     public static AngleWin32PlatformGraphics TryCreate(AngleOptions options)
     {
-         
-        
         Win32AngleEglInterface egl;
         try
         {
@@ -128,4 +127,13 @@ internal class AngleWin32PlatformGraphics : IPlatformGraphics
             }
         return null;
     }
+
+    public IGlContext CreateContext(IEnumerable<GlVersion>? versions)
+    {
+        if (UsesSharedContext)
+            throw new InvalidOperationException();
+        if (versions != null && versions.All(v => v.Type != GlProfileType.OpenGLES || v.Major != 3))
+            throw new OpenGlException("Unable to create context with requested version");
+        return (IGlContext)CreateContext();
+    }
 }
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index 25ea060576..ab6de1a027 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -37,6 +37,9 @@ namespace Avalonia.Win32
 
                 if (egl != null && egl.PlatformApi == AngleOptions.PlatformApi.DirectX11)
                 {
+                    AvaloniaLocator.CurrentMutable.Bind<IPlatformGraphicsOpenGlContextFactory>()
+                        .ToConstant(egl);
+                    
                     if (opts.UseWindowsUIComposition)
                     {
                         WinUiCompositorConnection.TryCreateAndRegister();
diff --git a/src/Windows/Avalonia.Win32/Win32StorageProvider.cs b/src/Windows/Avalonia.Win32/Win32StorageProvider.cs
index 8cc0a380f9..2da642bd19 100644
--- a/src/Windows/Avalonia.Win32/Win32StorageProvider.cs
+++ b/src/Windows/Avalonia.Win32/Win32StorageProvider.cs
@@ -134,10 +134,10 @@ namespace Avalonia.Win32
                         }
                     }
 
-                    if (folder?.TryGetUri(out var folderPath) == true)
+                    if (folder?.TryGetFullPath() is { } folderPath)
                     {
                         var riid = UnmanagedMethods.ShellIds.IShellItem;
-                        if (UnmanagedMethods.SHCreateItemFromParsingName(folderPath.LocalPath, IntPtr.Zero, ref riid, out var directoryShellItem)
+                        if (UnmanagedMethods.SHCreateItemFromParsingName(folderPath, IntPtr.Zero, ref riid, out var directoryShellItem)
                             == (uint)UnmanagedMethods.HRESULT.S_OK)
                         {
                             var proxy = MicroComRuntime.CreateProxyFor<IShellItem>(directoryShellItem, true);
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
index a801e83562..ef0e2467dc 100644
--- a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
@@ -25,7 +25,7 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
         using (var doc = new UIDocument(url))
         {
             _filePath = doc.FileUrl?.Path ?? url.FilePathUrl.Path;
-            Name = doc.LocalizedName ?? Path.GetFileName(_filePath) ?? url.FilePathUrl.LastPathComponent;
+            Name = doc.LocalizedName ?? System.IO.Path.GetFileName(_filePath) ?? url.FilePathUrl.LastPathComponent;
         }
     }
 
@@ -34,6 +34,7 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
     public bool CanBookmark => true;
 
     public string Name { get; }
+    public Uri Path => Url!;
 
     public Task<StorageItemProperties> GetBasicPropertiesAsync()
     {
@@ -83,12 +84,6 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
         }
     }
 
-    public bool TryGetUri([NotNullWhen(true)] out Uri uri)
-    {
-        uri = Url;
-        return uri is not null;
-    }
-
     public void Dispose()
     {
     }
@@ -121,18 +116,34 @@ internal sealed class IOSStorageFolder : IOSStorageItem, IStorageBookmarkFolder
     {
     }
 
-    public Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    public async Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
     {
-        var content = NSFileManager.DefaultManager.GetDirectoryContent(Url, null, NSDirectoryEnumerationOptions.None, out var error);
+        var tcs = new TaskCompletionSource<IReadOnlyList<IStorageItem>>();
+
+        new NSFileCoordinator().CoordinateRead(Url,
+            NSFileCoordinatorReadingOptions.WithoutChanges,
+            out var error,
+            uri =>
+            {
+                var content = NSFileManager.DefaultManager.GetDirectoryContent(uri, null, NSDirectoryEnumerationOptions.None, out var error);
+                if (error is not null)
+                {
+                    tcs.TrySetException(new NSErrorException(error));
+                }
+                else
+                {
+                    var items = content
+                        .Select(u => u.HasDirectoryPath ? (IStorageItem)new IOSStorageFolder(u) : new IOSStorageFile(u))
+                        .ToArray();
+                    tcs.TrySetResult(items);
+                }
+            });
+        
         if (error is not null)
         {
-            return Task.FromException<IReadOnlyList<IStorageItem>>(new NSErrorException(error));
+            throw new NSErrorException(error);
         }
 
-        var items = content
-            .Select(u => u.HasDirectoryPath ? (IStorageItem)new IOSStorageFolder(u) : new IOSStorageFile(u))
-            .ToArray();
-
-        return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
+        return await tcs.Task;
     }
 }
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs
index 5fdb7ecce1..376e988e74 100644
--- a/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageProvider.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.Logging;
 using Avalonia.Platform.Storage;
 using UIKit;
@@ -99,6 +100,40 @@ internal class IOSStorageProvider : IStorageProvider
             ? new IOSStorageFolder(url) : null);
     }
 
+    public Task<IStorageFile?> TryGetFileFromPath(Uri filePath)
+    {
+        // TODO: research if it's possible, maybe with additional permissions.
+        return Task.FromResult<IStorageFile?>(null);
+    }
+
+    public Task<IStorageFolder?> TryGetFolderFromPath(Uri folderPath)
+    {
+        // TODO: research if it's possible, maybe with additional permissions.
+        return Task.FromResult<IStorageFolder?>(null);
+    }
+
+    public Task<IStorageFolder?> TryGetWellKnownFolder(WellKnownFolder wellKnownFolder)
+    {
+        var directoryType = wellKnownFolder switch
+        {
+            WellKnownFolder.Desktop => NSSearchPathDirectory.DesktopDirectory,
+            WellKnownFolder.Documents => NSSearchPathDirectory.DocumentDirectory,
+            WellKnownFolder.Downloads => NSSearchPathDirectory.DownloadsDirectory,
+            WellKnownFolder.Music => NSSearchPathDirectory.MusicDirectory,
+            WellKnownFolder.Pictures => NSSearchPathDirectory.PicturesDirectory,
+            WellKnownFolder.Videos => NSSearchPathDirectory.MoviesDirectory,
+            _ => throw new ArgumentOutOfRangeException(nameof(wellKnownFolder), wellKnownFolder, null)
+        };
+        
+        var uri = NSFileManager.DefaultManager.GetUrl(directoryType, NSSearchPathDomain.Local, null, true, out var error);
+        if (error != null)
+        {
+            throw new NSErrorException(error);
+        }
+
+        return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(uri));
+    }
+
     public Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
     {
         return Task.FromException<IStorageFile?>(
@@ -127,17 +162,12 @@ internal class IOSStorageProvider : IStorageProvider
 
     private static NSUrl? GetUrlFromFolder(IStorageFolder? folder)
     {
-        if (folder is IOSStorageFolder iosFolder)
+        return folder switch
         {
-            return iosFolder.Url;
-        }
-
-        if (folder?.TryGetUri(out var fullPath) == true)
-        {
-            return fullPath;
-        }
-
-        return null;
+            IOSStorageFolder iosFolder => iosFolder.Url,
+            null => null,
+            _ => folder.Path
+        };
     }
 
     private Task<NSUrl[]> ShowPicker(UIDocumentPickerViewController documentPicker)
diff --git a/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
index 363fb3f5b3..43feb75c08 100644
--- a/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
@@ -1,5 +1,7 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Avalonia.Utilities;
@@ -23,7 +25,7 @@ namespace Avalonia.Base.UnitTests.Media
         [Theory]
         public void Should_Get_Distance_From_CharacterHit(double[] advances, int[] clusters, int start, int trailingLength, double expectedDistance)
         {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using(UnitTestApplication.Start(TestServices.StyledWindow))
             using (var glyphRun = CreateGlyphRun(advances, clusters))
             {
                 var characterHit = new CharacterHit(start, trailingLength);
@@ -42,7 +44,7 @@ namespace Avalonia.Base.UnitTests.Media
         public void Should_Get_CharacterHit_FromDistance(double[] advances, int[] clusters, double distance, int start,
             int trailingLengthExpected, bool isInsideExpected)
         {
-            using(UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            using(UnitTestApplication.Start(TestServices.StyledWindow))
             using (var glyphRun = CreateGlyphRun(advances, clusters))
             {
                 var textBounds = glyphRun.GetCharacterHitFromDistance(distance, out var isInside);
@@ -179,12 +181,14 @@ namespace Avalonia.Base.UnitTests.Media
         private static GlyphRun CreateGlyphRun(double[] glyphAdvances, int[] glyphClusters, int bidiLevel = 0)
         {
             var count = glyphAdvances.Length;
-            var glyphIndices = new ushort[count];
 
-            var characters = Enumerable.Repeat('a', count).ToArray();
+            var glyphInfos = new GlyphInfo[count];
+            for (var i = 0; i < count; ++i)
+            {
+                glyphInfos[i] = new GlyphInfo(0, glyphClusters[i], glyphAdvances[i]);
+            }
 
-            return new GlyphRun(new MockGlyphTypeface(), 10, characters, glyphIndices, glyphAdvances,
-                glyphClusters: glyphClusters, biDiLevel: bidiLevel);
+            return new GlyphRun(new MockGlyphTypeface(), 10, new string('a', count).AsMemory(), glyphInfos, biDiLevel: bidiLevel);
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
index 9d189d1950..eb69bed1e1 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTests.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Xunit;
 using Xunit.Abstractions;
@@ -32,7 +30,7 @@ namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
         private bool Run(BiDiClassData t)
         {
             var bidi = new BidiAlgorithm();
-            var bidiData = new BidiData(t.ParagraphLevel);
+            var bidiData = new BidiData { ParagraphEmbeddingLevel = t.ParagraphLevel };
         
             var text = Encoding.UTF32.GetString(MemoryMarshal.Cast<int, byte>(t.CodePoints).ToArray());
 
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/FormattingBufferHelperTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/FormattingBufferHelperTests.cs
new file mode 100644
index 0000000000..192f34eea7
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/FormattingBufferHelperTests.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Media.TextFormatting
+{
+    public class FormattingBufferHelperTests
+    {
+        public static TheoryData<int> SmallSizes => new() { 1, 500, 10_000, 125_000 };
+        public static TheoryData<int> LargeSizes => new() { 500_000, 1_000_000 };
+
+        [Theory]
+        [MemberData(nameof(SmallSizes))]
+        public void Should_Keep_Small_Buffer_List(int itemCount)
+        {
+            var capacity = FillAndClearList(itemCount);
+
+            Assert.True(capacity >= itemCount);
+        }
+
+        [Theory]
+        [MemberData(nameof(LargeSizes))]
+        public void Should_Reset_Large_Buffer_List(int itemCount)
+        {
+            var capacity = FillAndClearList(itemCount);
+
+            Assert.Equal(0, capacity);
+        }
+
+        private static int FillAndClearList(int itemCount)
+        {
+            var list = new List<int>();
+
+            for (var i = 0; i < itemCount; ++i)
+            {
+                list.Add(i);
+            }
+
+            FormattingBufferHelper.ClearThenResetIfTooLarge(list);
+
+            return list.Capacity;
+        }
+
+        [Theory]
+        [MemberData(nameof(SmallSizes))]
+        public void Should_Keep_Small_Buffer_ArrayBuilder(int itemCount)
+        {
+            var capacity = FillAndClearArrayBuilder(itemCount);
+
+            Assert.True(capacity >= itemCount);
+        }
+
+        [Theory]
+        [MemberData(nameof(LargeSizes))]
+        public void Should_Reset_Large_Buffer_ArrayBuilder(int itemCount)
+        {
+            var capacity = FillAndClearArrayBuilder(itemCount);
+
+            Assert.Equal(0, capacity);
+        }
+
+        private static int FillAndClearArrayBuilder(int itemCount)
+        {
+            var arrayBuilder = new ArrayBuilder<int>();
+
+            for (var i = 0; i < itemCount; ++i)
+            {
+                arrayBuilder.AddItem(i);
+            }
+
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref arrayBuilder);
+
+            return arrayBuilder.Capacity;
+        }
+
+        [Theory]
+        [MemberData(nameof(SmallSizes))]
+        public void Should_Keep_Small_Buffer_Stack(int itemCount)
+        {
+            var capacity = FillAndClearStack(itemCount);
+
+            Assert.True(capacity >= itemCount);
+        }
+
+        [Theory]
+        [MemberData(nameof(LargeSizes))]
+        public void Should_Reset_Large_Buffer_Stack(int itemCount)
+        {
+            var capacity = FillAndClearStack(itemCount);
+
+            Assert.Equal(0, capacity);
+        }
+
+        private static int FillAndClearStack(int itemCount)
+        {
+            var stack = new Stack<int>();
+
+            for (var i = 0; i < itemCount; ++i)
+            {
+                stack.Push(i);
+            }
+
+            FormattingBufferHelper.ClearThenResetIfTooLarge(stack);
+
+            var array = (Array) stack.GetType()
+                .GetField("_array", BindingFlags.NonPublic | BindingFlags.Instance)!
+                .GetValue(stack)!;
+
+            return array.Length;
+        }
+
+        [Theory]
+        [MemberData(nameof(SmallSizes))]
+        public void Should_Keep_Small_Buffer_Dictionary(int itemCount)
+        {
+            var capacity = FillAndClearDictionary(itemCount);
+
+            Assert.True(capacity >= itemCount);
+        }
+
+        [Theory]
+        [MemberData(nameof(LargeSizes))]
+        public void Should_Reset_Large_Buffer_Dictionary(int itemCount)
+        {
+            var capacity = FillAndClearDictionary(itemCount);
+
+            Assert.True(capacity <= 3); // dictionary trims to the nearest prime starting with 3
+        }
+
+        private static int FillAndClearDictionary(int itemCount)
+        {
+            var dictionary = new Dictionary<int, int>();
+
+            for (var i = 0; i < itemCount; ++i)
+            {
+                dictionary.Add(i, i);
+            }
+
+            FormattingBufferHelper.ClearThenResetIfTooLarge(ref dictionary);
+
+            var array = (Array) dictionary.GetType()
+                .GetField("_entries", BindingFlags.NonPublic | BindingFlags.Instance)!
+                .GetValue(dictionary)!;
+
+            return array.Length;
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
index a022039000..0e49669a04 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
@@ -40,9 +40,9 @@ namespace Avalonia.Base.UnitTests.Media.TextFormatting
 
             var enumerator = new GraphemeEnumerator(text);
 
-            enumerator.MoveNext();
+            enumerator.MoveNext(out var g);
 
-            var actual = enumerator.Current.Text;
+            var actual = text.AsSpan(g.Offset, g.Length);
 
             bool pass = actual.Length == grapheme.Length;
 
@@ -86,9 +86,9 @@ namespace Avalonia.Base.UnitTests.Media.TextFormatting
 
             var count = 0;
 
-            while (enumerator.MoveNext())
+            while (enumerator.MoveNext(out var grapheme))
             {
-                Assert.Equal(1, enumerator.Current.Text.Length);
+                Assert.Equal(1, grapheme.Length);
 
                 count++;
             }
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
index d198fe81a6..3db9a32b65 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
@@ -24,32 +24,33 @@ namespace Avalonia.Base.UnitTests.Media.TextFormatting
         public void BasicLatinTest()
         {
             var lineBreaker = new LineBreakEnumerator("Hello World\r\nThis is a test.");
+            LineBreak lineBreak;
 
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(6, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
+            Assert.True(lineBreaker.MoveNext(out lineBreak));
+            Assert.Equal(6, lineBreak.PositionWrap);
+            Assert.False(lineBreak.Required);
 
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(13, lineBreaker.Current.PositionWrap);
-            Assert.True(lineBreaker.Current.Required);
+            Assert.True(lineBreaker.MoveNext(out lineBreak));
+            Assert.Equal(13, lineBreak.PositionWrap);
+            Assert.True(lineBreak.Required);
 
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(18, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
+            Assert.True(lineBreaker.MoveNext(out lineBreak));
+            Assert.Equal(18, lineBreak.PositionWrap);
+            Assert.False(lineBreak.Required);
 
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(21, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
+            Assert.True(lineBreaker.MoveNext(out lineBreak));
+            Assert.Equal(21, lineBreak.PositionWrap);
+            Assert.False(lineBreak.Required);
 
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(23, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
+            Assert.True(lineBreaker.MoveNext(out lineBreak));
+            Assert.Equal(23, lineBreak.PositionWrap);
+            Assert.False(lineBreak.Required);
 
-            Assert.True(lineBreaker.MoveNext());
-            Assert.Equal(28, lineBreaker.Current.PositionWrap);
-            Assert.False(lineBreaker.Current.Required);
+            Assert.True(lineBreaker.MoveNext(out lineBreak));
+            Assert.Equal(28, lineBreak.PositionWrap);
+            Assert.False(lineBreak.Required);
 
-            Assert.False(lineBreaker.MoveNext());
+            Assert.False(lineBreaker.MoveNext(out lineBreak));
         }
 
 
@@ -72,9 +73,9 @@ namespace Avalonia.Base.UnitTests.Media.TextFormatting
         {
             var breaks = new List<LineBreak>();
 
-            while (lineBreaker.MoveNext())
+            while (lineBreaker.MoveNext(out var lineBreak))
             {
-                breaks.Add(lineBreaker.Current);
+                breaks.Add(lineBreak);
             }
 
             return breaks;
@@ -104,9 +105,9 @@ namespace Avalonia.Base.UnitTests.Media.TextFormatting
 
             var foundBreaks = new List<int>();
             
-            while (lineBreaker.MoveNext())
+            while (lineBreaker.MoveNext(out var lineBreak))
             {
-                foundBreaks.Add(lineBreaker.Current.PositionWrap);
+                foundBreaks.Add(lineBreak.PositionWrap);
             }
             
             // Check the same
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
index 4a879c8ced..b648b0d178 100644
--- a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Platform.Storage.FileIO;
 using Avalonia.Utilities;
 using Xunit;
 
@@ -26,4 +27,17 @@ public class UriExtensionsTests
 
         Assert.Equal(string.Empty, name);
     }
+    
+    [Theory]
+    [InlineData("/home/Projects.txt")]
+    [InlineData("/home/Stahování/Požární kniha 2.txt")]
+    [InlineData("C:\\%51.txt")]
+    [InlineData("/home/asd#xcv.txt")]
+    [InlineData("C:\\\\Work\\Projects.txt")]
+    public void Should_Convert_File_Path_To_Uri_And_Back(string path)
+    {
+        var uri = StorageProviderHelpers.FilePathToUri(path);
+
+        Assert.Equal(path, uri.LocalPath);
+    }
 }
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
index 42e33729ac..76c7fe97fc 100644
--- a/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
@@ -5,6 +5,7 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 
 namespace Avalonia.Base.UnitTests.VisualTree
 {
@@ -15,6 +16,8 @@ namespace Avalonia.Base.UnitTests.VisualTree
             throw new NotImplementedException();
         }
 
+        public bool IsLost => false;
+
         public object TryGetFeature(Type featureType) => null;
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
@@ -74,7 +77,8 @@ namespace Avalonia.Base.UnitTests.VisualTree
             throw new NotImplementedException();
         }
 
-        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, 
+            IReadOnlyList<GlyphInfo> glyphInfos, Point baselineOrigin)
         {
             throw new NotImplementedException();
         }
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index 941d377a17..0ddee2ad7a 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
+    <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
index 8436881122..e83b2d7598 100644
--- a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
+++ b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Benchmarks
         {
         }
 
-        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+        public void DrawGlyphRun(IBrush foreground, IRef<IGlyphRunImpl> glyphRun)
         {
         }
 
diff --git a/tests/Avalonia.Benchmarks/NullGlyphRun.cs b/tests/Avalonia.Benchmarks/NullGlyphRun.cs
index 1c2c7c0d7d..c4707c78c8 100644
--- a/tests/Avalonia.Benchmarks/NullGlyphRun.cs
+++ b/tests/Avalonia.Benchmarks/NullGlyphRun.cs
@@ -5,6 +5,10 @@ namespace Avalonia.Benchmarks
 {
     internal class NullGlyphRun : IGlyphRunImpl
     {
+        public Size Size => default;
+
+        public Point BaselineOrigin => default;
+
         public void Dispose()
         {
         }
diff --git a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
index a272d89b8a..37b79855db 100644
--- a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
+++ b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
@@ -5,6 +5,7 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using Microsoft.Diagnostics.Runtime;
 
 namespace Avalonia.Benchmarks
@@ -46,6 +47,8 @@ namespace Avalonia.Benchmarks
             throw new NotImplementedException();
         }
 
+        public bool IsLost => false;
+
         public object TryGetFeature(Type featureType) => null;
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
@@ -120,9 +123,10 @@ namespace Avalonia.Benchmarks
             return new MockStreamGeometryImpl();
         }
 
-        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, 
+            IReadOnlyList<GlyphInfo> glyphInfos, Point baselineOrigin)
         {
-            return new MockGlyphRun();
+            return new MockGlyphRun(glyphInfos);
         }
 
         public IPlatformRenderInterfaceContext CreateBackendContext(IPlatformGraphicsContext graphicsContext)
diff --git a/tests/Avalonia.Benchmarks/Text/HugeTextLayout.cs b/tests/Avalonia.Benchmarks/Text/HugeTextLayout.cs
index bf0253e9ab..4dad8442de 100644
--- a/tests/Avalonia.Benchmarks/Text/HugeTextLayout.cs
+++ b/tests/Avalonia.Benchmarks/Text/HugeTextLayout.cs
@@ -3,32 +3,46 @@ using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
+using Avalonia.Skia;
 using Avalonia.UnitTests;
 using BenchmarkDotNet.Attributes;
 
 namespace Avalonia.Benchmarks.Text;
 
 [MemoryDiagnoser]
+[MinIterationTime(150)]
+[MaxWarmupCount(15)]
 public class HugeTextLayout : IDisposable
 {
+    private static readonly Random s_rand = new();
+    private static readonly bool s_useSkia = true;
+
     private readonly IDisposable _app;
-    private string[] _manySmallStrings;
-    private static Random _rand = new Random();
-    
+    private readonly string[] _manySmallStrings;
+
     private static string RandomString(int length)
     {
         const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789&?%$@";
-        return new string(Enumerable.Repeat(chars, length).Select(s => s[_rand.Next(s.Length)]).ToArray());
+        return new string(Enumerable.Repeat(chars, length).Select(s => s[s_rand.Next(s.Length)]).ToArray());
     }
 
     public HugeTextLayout()
     {
-        _manySmallStrings = Enumerable.Range(0, 1000).Select(x => RandomString(_rand.Next(2, 15))).ToArray();
-        _app = UnitTestApplication.Start(
-            TestServices.StyledWindow.With(
-                renderInterface: new NullRenderingPlatform(),
-                threadingInterface: new NullThreadingPlatform(),
-                standardCursorFactory: new NullCursorFactory()));
+        _manySmallStrings = Enumerable.Range(0, 1000).Select(_ => RandomString(s_rand.Next(2, 15))).ToArray();
+
+        var testServices = TestServices.StyledWindow.With(
+            renderInterface: new NullRenderingPlatform(),
+            threadingInterface: new NullThreadingPlatform(),
+            standardCursorFactory: new NullCursorFactory());
+
+        if (s_useSkia)
+        {
+            testServices = testServices.With(
+                textShaperImpl: new TextShaperImpl(),
+                fontManagerImpl: new FontManagerImpl());
+        }
+
+        _app = UnitTestApplication.Start(testServices);
     }
     
     private const string Text = @"Though, the objectives of the development of the prominent landmarks can be neglected in most cases, it should be realized that after the completion of the strategic decision gives rise to The Expertise of Regular Program (Carlton Cartwright in The Book of the Key Factor) 
@@ -44,7 +58,13 @@ Admitting that the possibility of achieving the results of the constructive crit
 Everyone understands what it takes to the draft analysis and prior decisions and early design solutions. In any case, we can systematically change the mechanism of the sources and influences of the continuing financing doctrine. This could exceedingly be a result of a task analysis the hardware maintenance. The real reason of the strategic planning seemingly the influence on eventual productivity. Everyone understands what it takes to the well-known practice. Therefore, the concept of the productivity boost can be treated as the only solution the driving factor. 
 It may reveal how the matters of peculiar interest slowly the goals and objectives or the diverse sources of information the positive influence of any major outcomes complete failure of the supposed theory.  
 In respect that the structure of the sufficient amount poses problems and challenges for both the set of related commands and controls and the ability bias.";
-    
+
+    [Params(false, true)]
+    public bool Wrap { get; set; }
+
+    [Params(false, true)]
+    public bool Trim { get; set; }
+
     [Benchmark]
     public TextLayout BuildTextLayout() => MakeLayout(Text);
 
@@ -69,7 +89,17 @@ In respect that the structure of the sufficient amount poses problems and challe
     public TextLayout BuildEmojisTextLayout() => MakeLayout(Emojis);
 
     [Benchmark]
-    public TextLayout[] BuildManySmallTexts() => _manySmallStrings.Select(MakeLayout).ToArray();
+    public TextLayout[] BuildManySmallTexts()
+    {
+        var results = new TextLayout[_manySmallStrings.Length];
+
+        for (var i = 0; i < _manySmallStrings.Length; i++)
+        {
+            results[i] = MakeLayout(_manySmallStrings[i]);
+        }
+
+        return results;
+    }
 
     [Benchmark]
     public void VirtualizeTextBlocks()
@@ -91,9 +121,12 @@ In respect that the structure of the sufficient amount poses problems and challe
         }
     }
 
-    private static TextLayout MakeLayout(string str)
+    private TextLayout MakeLayout(string str)
     {
-        var layout = new TextLayout(str, Typeface.Default, 12d, Brushes.Black, maxWidth: 120);
+        var wrapping = Wrap ? TextWrapping.WrapWithOverflow : TextWrapping.NoWrap;
+        var trimming = Trim ? TextTrimming.CharacterEllipsis : TextTrimming.None;
+        var layout = new TextLayout(str, Typeface.Default, 12d, Brushes.Black, maxWidth: 120,
+            textTrimming: trimming, textWrapping: wrapping);
         layout.Dispose();
         return layout;
     }
diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index 894dc5b996..3b2ca51976 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -205,7 +205,8 @@ namespace Avalonia.Controls.UnitTests
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             fontManagerImpl: new MockFontManagerImpl(),
             standardCursorFactory: Mock.Of<ICursorFactory>(),
-            textShaperImpl: new MockTextShaperImpl());
+            textShaperImpl: new MockTextShaperImpl(),
+            renderInterface: new MockPlatformRenderInterface());
 
         private static IControlTemplate CreateTemplate()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index 3f1a3b6342..8170545f68 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -759,6 +759,7 @@ namespace Avalonia.Controls.UnitTests
                 var lbItems = target.GetLogicalChildren().OfType<ListBoxItem>().ToArray();
 
                 var first = lbItems.First();
+                var beforeLast = lbItems[^2];
                 var last = lbItems.Last();
 
                 first.Focus();
@@ -769,6 +770,12 @@ namespace Avalonia.Controls.UnitTests
                 RaiseKeyEvent(target, Key.Up);
                 Assert.Equal(true, last.IsSelected);
 
+                RaiseKeyEvent(target, Key.Up);
+                Assert.Equal(true, beforeLast.IsSelected);
+
+                RaiseKeyEvent(target, Key.Down);
+                Assert.Equal(true, last.IsSelected);
+
                 RaiseKeyEvent(target, Key.Down);
                 Assert.Equal(true, first.IsSelected);
 
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
index b358c98a62..942eb8bf5b 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
@@ -28,7 +28,6 @@ namespace Avalonia.Controls.UnitTests
 
             target.Presenter.Panel.Children[1].RaiseEvent(new GotFocusEventArgs
             {
-                RoutedEvent = InputElement.GotFocusEvent,
                 NavigationMethod = NavigationMethod.Directional,
                 KeyModifiers = KeyModifiers.Shift
             });
@@ -52,7 +51,6 @@ namespace Avalonia.Controls.UnitTests
 
             target.Presenter.Panel.Children[1].RaiseEvent(new GotFocusEventArgs
             {
-                RoutedEvent = InputElement.GotFocusEvent,
                 NavigationMethod = NavigationMethod.Directional,
                 KeyModifiers = KeyModifiers.Control
             });
@@ -77,7 +75,6 @@ namespace Avalonia.Controls.UnitTests
 
             target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
             {
-                RoutedEvent = InputElement.GotFocusEvent,
                 NavigationMethod = NavigationMethod.Directional,
                 KeyModifiers = KeyModifiers.Control
             });
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index cb4e81001f..131642fc4e 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -33,7 +33,6 @@ namespace Avalonia.Controls.UnitTests
 
             target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
             {
-                RoutedEvent = InputElement.GotFocusEvent,
                 NavigationMethod = NavigationMethod.Tab,
             });
 
@@ -53,7 +52,6 @@ namespace Avalonia.Controls.UnitTests
 
             target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
             {
-                RoutedEvent = InputElement.GotFocusEvent,
                 NavigationMethod = NavigationMethod.Directional,
             });
 
@@ -73,7 +71,6 @@ namespace Avalonia.Controls.UnitTests
 
             target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
             {
-                RoutedEvent = InputElement.GotFocusEvent,
                 NavigationMethod = NavigationMethod.Directional,
                 KeyModifiers = KeyModifiers.Control
             });
@@ -96,7 +93,6 @@ namespace Avalonia.Controls.UnitTests
 
                 target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
                 {
-                    RoutedEvent = InputElement.GotFocusEvent,
                     NavigationMethod = NavigationMethod.Directional,
                     KeyModifiers = KeyModifiers.Control
                 });
diff --git a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
index c1d9fad6f4..2732f6a5fb 100644
--- a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
@@ -107,7 +107,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void CaretIndex_Can_Moved_To_Position_After_The_End_Of_Text_With_Arrow_Key()
         {
-            using (Start())
+            using (Start(TestServices.StyledWindow))
             {
                 var target = new MaskedTextBox
                 {
@@ -182,7 +182,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Control_Backspace_Should_Remove_The_Word_Before_The_Caret_If_There_Is_No_Selection()
         {
-            using (Start())
+            using (Start(TestServices.StyledWindow))
             {
                 MaskedTextBox textBox = new MaskedTextBox
                 {
@@ -224,7 +224,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Control_Delete_Should_Remove_The_Word_After_The_Caret_If_There_Is_No_Selection()
         {
-            using (Start())
+            using (Start(TestServices.StyledWindow))
             {
                 var textBox = new MaskedTextBox
                 {
@@ -810,7 +810,7 @@ namespace Avalonia.Controls.UnitTests
             bool fromClipboard,
             string expected)
         {
-            using (Start())
+            using (Start(TestServices.StyledWindow))
             {
                 var target = new MaskedTextBox
                 {
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 1775d7ef70..7d129d987e 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -2131,9 +2131,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
         private static IDisposable Start()
         {
-            return UnitTestApplication.Start(new TestServices(
-                fontManagerImpl: new MockFontManagerImpl(),
-                textShaperImpl: new MockTextShaperImpl()));
+            return UnitTestApplication.Start(TestServices.StyledWindow);
         }
 
         private static void Prepare(SelectingItemsControl target)
diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
index 2fd10010a6..e0bf230d99 100644
--- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
@@ -101,7 +101,8 @@ namespace Avalonia.Controls.UnitTests
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             fontManagerImpl: new MockFontManagerImpl(),
             standardCursorFactory: Mock.Of<ICursorFactory>(),
-            textShaperImpl: new MockTextShaperImpl());
+            textShaperImpl: new MockTextShaperImpl(),
+            renderInterface: new MockPlatformRenderInterface());
 
         private static IControlTemplate CreateTemplate()
         {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index 656c2cbbbc..3ba8e8354d 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -334,7 +334,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 Path = "Foo",
             };
 
-            var result = binding.Initiate(target, TextBox.TextProperty).Value;
+            var result = binding.Initiate(target, TextBox.TextProperty).Source;
 
             Assert.IsType<DefaultValueConverter>(((BindingExpression)result).Converter);
         }
@@ -350,7 +350,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 Path = "Foo",
             };
 
-            var result = binding.Initiate(target, TextBox.TextProperty).Value;
+            var result = binding.Initiate(target, TextBox.TextProperty).Source;
 
             Assert.Same(converter.Object, ((BindingExpression)result).Converter);
         }
@@ -367,7 +367,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 Path = "Bar",
             };
 
-            var result = binding.Initiate(target, TextBox.TextProperty).Value;
+            var result = binding.Initiate(target, TextBox.TextProperty).Source;
 
             Assert.Same("foo", ((BindingExpression)result).ConverterParameter);
         }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
index 2a0750b131..680c49d098 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             var expressionObserver = (BindingExpression)target.Initiate(
                 textBlock, 
-                TextBlock.TextProperty).Observable;
+                TextBlock.TextProperty).Source;
 
             Assert.Same(StringConverters.IsNullOrEmpty, expressionObserver.Converter);
         }
@@ -46,7 +46,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
                 var expressionObserver = (BindingExpression)target.Initiate(
                     textBlock,
-                    TextBlock.TextProperty).Observable;
+                    TextBlock.TextProperty).Source;
 
                 Assert.IsType<StringFormatValueConverter>(expressionObserver.Converter);
             }
@@ -69,7 +69,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
                 var expressionObserver = (BindingExpression)target.Initiate(
                     textBlock,
-                    TextBlock.TagProperty).Observable;
+                    TextBlock.TagProperty).Source;
 
                 Assert.IsType<StringFormatValueConverter>(expressionObserver.Converter);
             }
@@ -92,7 +92,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
                 var expressionObserver = (BindingExpression)target.Initiate(
                     textBlock,
-                    TextBlock.MarginProperty).Observable;
+                    TextBlock.MarginProperty).Source;
 
                 Assert.Same(DefaultValueConverter.Instance, expressionObserver.Converter);
             }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
index 45deb97f51..505eddb146 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             var target = new Binding(nameof(Class1.Foo));
             var instanced = target.Initiate(textBlock, TextBlock.TextProperty, enableDataValidation: false);
-            var subject = (BindingExpression)instanced.Value;
+            var subject = (BindingExpression)instanced.Source;
             object result = null;
 
             subject.Subscribe(x => result = x);
@@ -38,7 +38,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             var target = new Binding(nameof(Class1.Foo));
             var instanced = target.Initiate(textBlock, TextBlock.TextProperty, enableDataValidation: true);
-            var subject = (BindingExpression)instanced.Value;
+            var subject = (BindingExpression)instanced.Source;
             object result = null;
 
             subject.Subscribe(x => result = x);
@@ -56,7 +56,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             var target = new Binding(nameof(Class1.Foo)) { Priority = BindingPriority.Template };
             var instanced = target.Initiate(textBlock, TextBlock.TextProperty, enableDataValidation: true);
-            var subject = (BindingExpression)instanced.Value;
+            var subject = (BindingExpression)instanced.Source;
             object result = null;
 
             subject.Subscribe(x => result = x);
diff --git a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
index a7ef2c4e4d..bf9631760a 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Markup.UnitTests.Data
             };
 
             var target = new Control { DataContext = source };
-            var observable = binding.Initiate(target, null).Observable;
+            var observable = binding.Initiate(target, null).Source;
             var result = await observable.Take(1);
 
             Assert.Equal("1,2,3", result);
@@ -59,7 +59,7 @@ namespace Avalonia.Markup.UnitTests.Data
             };
 
             var target = new Control { DataContext = source };
-            var observable = binding.Initiate(target, null).Observable;
+            var observable = binding.Initiate(target, null).Source;
             var result = await observable.Take(1);
 
             Assert.Equal("1,2,3", result);
diff --git a/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
index 979dbec674..1e56981b98 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
@@ -248,6 +248,38 @@ namespace Avalonia.Markup.UnitTests.Data
             // binding is initiated.
             Assert.Equal(new[] { "foo" }, converter.Values);
         }
+        
+        [Fact]
+        public void Should_Execute_Converter_Without_Specific_TargetType()
+        {
+            // See https://github.com/AvaloniaUI/Avalonia/issues/9766
+            var source = new Button
+            {
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.IsVisibleProperty] = new MultiBinding
+                        {
+                            Converter = BoolConverters.And,
+                            Bindings =
+                            {
+                                new TemplateBinding(ContentControl.ContentProperty)
+                                {
+                                    Converter = ObjectConverters.IsNotNull
+                                }
+                            }
+                        }
+                    }),
+            };
+
+            source.ApplyTemplate();
+
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
+
+            Assert.False(target.IsVisible);
+            source.Content = "foo";
+            Assert.True(target.IsVisible);
+        }
 
         private class PrefixConverter : IValueConverter
         {
diff --git a/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs b/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
index 31e485448e..772d6e1023 100644
--- a/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
+++ b/tests/Avalonia.RenderTests/Media/GlyphRunTests.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls.Documents;
 using Avalonia.Controls.Shapes;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using Xunit;
 
 #if AVALONIA_SKIA
@@ -170,11 +171,16 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 
                 var advance = glyphTypeface.GetGlyphAdvance(glyphIndices[0]) * scale;
 
-                var advances = new[] { advance, advance, advance};
+                var glyphInfos = new[]
+                {
+                    new GlyphInfo(glyphIndices[0], 0, advance),
+                    new GlyphInfo(glyphIndices[1], 1, advance),
+                    new GlyphInfo(glyphIndices[2], 2, advance)
+                };
 
                 var characters = new[] { 'A', 'B', 'C' };
 
-                GlyphRun = new GlyphRun(glyphTypeface, 100, characters, glyphIndices, advances);
+                GlyphRun = new GlyphRun(glyphTypeface, 100, characters, glyphInfos);
             }
 
             public GlyphRun GlyphRun { get; }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
index 04bc401479..bfe03030c6 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
@@ -110,7 +110,7 @@ namespace Avalonia.Skia.UnitTests.Media
                 if (glyphRun.IsLeftToRight)
                 {
                     var characterHit =
-                        glyphRun.GetCharacterHitFromDistance(glyphRun.Metrics.WidthIncludingTrailingWhitespace, out _);
+                        glyphRun.GetCharacterHitFromDistance(glyphRun.Size.Width, out _);
                     
                     Assert.Equal(glyphRun.Characters.Length, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
                 }
@@ -134,11 +134,11 @@ namespace Avalonia.Skia.UnitTests.Media
 
                 foreach (var rect in rects)
                 {
-                    var currentCluster = glyphRun.GlyphClusters[index];
+                    var currentCluster = glyphRun.GlyphInfos[index].GlyphCluster;
 
-                    while (currentCluster == lastCluster && index + 1 < glyphRun.GlyphClusters.Count)
+                    while (currentCluster == lastCluster && index + 1 < glyphRun.GlyphInfos.Count)
                     {
-                        currentCluster = glyphRun.GlyphClusters[++index];
+                        currentCluster = glyphRun.GlyphInfos[++index].GlyphCluster;
                     }
 
                     //Non trailing edge
@@ -159,17 +159,17 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             var height = glyphRun.Size.Height;
 
-            var currentX = glyphRun.IsLeftToRight ? 0d : glyphRun.Metrics.WidthIncludingTrailingWhitespace;
+            var currentX = glyphRun.IsLeftToRight ? 0d : glyphRun.Size.Width;
             
-            var rects = new List<Rect>(glyphRun.GlyphAdvances!.Count);
+            var rects = new List<Rect>(glyphRun.GlyphInfos!.Count);
 
             var lastCluster = -1;
 
-            for (var index = 0; index < glyphRun.GlyphAdvances.Count; index++)
+            for (var index = 0; index < glyphRun.GlyphInfos.Count; index++)
             {
-                var currentCluster = glyphRun.GlyphClusters![index];
+                var currentCluster = glyphRun.GlyphInfos[index].GlyphCluster;
                 
-                var advance = glyphRun.GlyphAdvances[index];
+                var advance = glyphRun.GlyphInfos[index].GlyphAdvance;
 
                 if (lastCluster != currentCluster)
                 {
@@ -216,11 +216,8 @@ namespace Avalonia.Skia.UnitTests.Media
                 shapedBuffer.GlyphTypeface,
                 shapedBuffer.FontRenderingEmSize,
                 shapedBuffer.Text,
-                shapedBuffer.GlyphIndices,
-                shapedBuffer.GlyphAdvances,
-                shapedBuffer.GlyphOffsets,
-                shapedBuffer.GlyphClusters,
-                shapedBuffer.BidiLevel);
+                shapedBuffer.GlyphInfos,
+                biDiLevel: shapedBuffer.BidiLevel);
 
             if(shapedBuffer.BidiLevel == 1)
             {
@@ -233,7 +230,7 @@ namespace Avalonia.Skia.UnitTests.Media
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
-                .With(renderInterface: new PlatformRenderInterface(null),
+                .With(renderInterface: new PlatformRenderInterface(),
                     textShaperImpl: new TextShaperImpl(),
                     fontManagerImpl: new CustomFontManagerImpl()));
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
index b90752861c..7822d6624b 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
@@ -283,9 +283,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var expected = new List<int>();
 
-                while (lineBreaker.MoveNext())
+                while (lineBreaker.MoveNext(out var lineBreak))
                 {
-                    expected.Add(lineBreaker.Current.PositionWrap - 1);
+                    expected.Add(lineBreak.PositionWrap - 1);
                 }
 
                 var typeface = new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#" +
@@ -585,7 +585,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var expectedRuns = expectedTextLine.TextRuns.Cast<ShapedTextRun>().ToList();
 
-                var expectedGlyphs = expectedRuns.SelectMany(x => x.GlyphRun.GlyphIndices).ToList();
+                var expectedGlyphs = expectedRuns
+                    .SelectMany(run => run.GlyphRun.GlyphInfos, (_, glyph) => glyph.GlyphIndex)
+                    .ToList();
 
                 for (var i = 0; i < text.Length; i++)
                 {
@@ -604,7 +606,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                         var shapedRuns = textLine.TextRuns.Cast<ShapedTextRun>().ToList();
 
-                        var actualGlyphs = shapedRuns.SelectMany(x => x.GlyphRun.GlyphIndices).ToList();
+                        var actualGlyphs = shapedRuns
+                            .SelectMany(x => x.GlyphRun.GlyphInfos, (_, glyph) => glyph.GlyphIndex)
+                            .ToList();
 
                         Assert.Equal(expectedGlyphs, actualGlyphs);
                     }
@@ -706,7 +710,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         public static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
-                .With(renderInterface: new PlatformRenderInterface(null),
+                .With(renderInterface: new PlatformRenderInterface(),
                     textShaperImpl: new TextShaperImpl()));
 
             AvaloniaLocator.CurrentMutable
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 1fd26748cd..2b63f24cf6 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -142,8 +142,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     black,
                     textWrapping: TextWrapping.Wrap);
 
-                var expectedGlyphs = expected.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextRun>()
-                    .SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
+                var expectedGlyphs = GetGlyphs(expected);
 
                 var outer = new GraphemeEnumerator(text);
                 var inner = new GraphemeEnumerator(text);
@@ -152,9 +151,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 while (true)
                 {
-                    while (inner.MoveNext())
+                    Grapheme grapheme;
+                    while (inner.MoveNext(out grapheme))
                     {
-                        j += inner.Current.Text.Length;
+                        j += grapheme.Length;
 
                         if (j + i > text.Length)
                         {
@@ -175,8 +175,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                             textWrapping: TextWrapping.Wrap,
                             textStyleOverrides: spans);
 
-                        var actualGlyphs = actual.TextLines.Select(x => string.Join('|', x.TextRuns.Cast<ShapedTextRun>()
-                            .SelectMany(x => x.ShapedBuffer.GlyphIndices))).ToList();
+                        var actualGlyphs = GetGlyphs(actual);
 
                         Assert.Equal(expectedGlyphs.Count, actualGlyphs.Count);
 
@@ -186,16 +185,23 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         }
                     }
 
-                    if (!outer.MoveNext())
+                    if (!outer.MoveNext(out grapheme))
                     {
                         break;
                     }
 
                     inner = new GraphemeEnumerator(text);
 
-                    i += outer.Current.Text.Length;
+                    i += grapheme.Length;
                 }
             }
+
+            static List<string> GetGlyphs(TextLayout textLayout)
+                => textLayout.TextLines
+                    .Select(line => string.Join('|', line.TextRuns
+                        .Cast<ShapedTextRun>()
+                        .SelectMany(run => run.ShapedBuffer.GlyphInfos, (_, glyph) => glyph.GlyphIndex)))
+                    .ToList();
         }
 
         [Fact]
@@ -484,13 +490,13 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 {
                     var shapedRun = (ShapedTextRun)textRun;
 
-                    var glyphClusters = shapedRun.ShapedBuffer.GlyphClusters;
+                    var glyphClusters = shapedRun.ShapedBuffer.GlyphInfos.Select(glyph => glyph.GlyphCluster).ToArray();
 
-                    var expected = clusters.Skip(index).Take(glyphClusters.Count).ToArray();
+                    var expected = clusters.Skip(index).Take(glyphClusters.Length).ToArray();
 
                     Assert.Equal(expected, glyphClusters);
 
-                    index += glyphClusters.Count;
+                    index += glyphClusters.Length;
                 }
             }
         }
@@ -515,13 +521,13 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 Assert.Equal(1, layout.TextLines[0].TextRuns.Count);
 
-                Assert.Equal(expectedLength, ((ShapedTextRun)layout.TextLines[0].TextRuns[0]).GlyphRun.GlyphClusters.Count);
+                Assert.Equal(expectedLength, ((ShapedTextRun)layout.TextLines[0].TextRuns[0]).GlyphRun.GlyphInfos.Count);
 
-                Assert.Equal(5, ((ShapedTextRun)layout.TextLines[0].TextRuns[0]).ShapedBuffer.GlyphClusters[5]);
+                Assert.Equal(5, ((ShapedTextRun)layout.TextLines[0].TextRuns[0]).ShapedBuffer.GlyphInfos[5].GlyphCluster);
 
                 if (expectedLength == 7)
                 {
-                    Assert.Equal(5, ((ShapedTextRun)layout.TextLines[0].TextRuns[0]).ShapedBuffer.GlyphClusters[6]);
+                    Assert.Equal(5, ((ShapedTextRun)layout.TextLines[0].TextRuns[0]).ShapedBuffer.GlyphInfos[6].GlyphCluster);
                 }
             }
         }
@@ -562,9 +568,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var replacementGlyph = Typeface.Default.GlyphTypeface.GetGlyph(Codepoint.ReplacementCodepoint);
 
-                foreach (var glyph in textRun.GlyphRun.GlyphIndices)
+                foreach (var glyphInfo in textRun.GlyphRun.GlyphInfos)
                 {
-                    Assert.Equal(replacementGlyph, glyph);
+                    Assert.Equal(replacementGlyph, glyphInfo.GlyphIndex);
                 }
             }
         }
@@ -776,8 +782,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     Assert.Equal(textLine.WidthIncludingTrailingWhitespace, rect.Width);
                 }
 
-                var rects = layout.TextLines.SelectMany(x => x.TextRuns.Cast<ShapedTextRun>())
-                    .SelectMany(x => x.ShapedBuffer.GlyphAdvances).ToArray();
+                var rects = layout.TextLines
+                    .SelectMany(x => x.TextRuns.Cast<ShapedTextRun>())
+                    .SelectMany(x => x.ShapedBuffer.GlyphInfos, (_, glyph) => glyph.GlyphAdvance)
+                    .ToArray();
 
                 for (var i = 0; i < SingleLineText.Length; i++)
                 {
@@ -865,10 +873,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var currentX = 0.0;
 
-                for (var i = 0; i < firstRun.GlyphRun.GlyphClusters.Count; i++)
+                for (var i = 0; i < firstRun.GlyphRun.GlyphInfos.Count; i++)
                 {
-                    var cluster = firstRun.GlyphRun.GlyphClusters[i];
-                    var advance = firstRun.GlyphRun.GlyphAdvances[i];
+                    var cluster = firstRun.GlyphRun.GlyphInfos[i].GlyphCluster;
+                    var advance = firstRun.GlyphRun.GlyphInfos[i].GlyphAdvance;
 
                     hit = layout.HitTestPoint(new Point(currentX, 0));
 
@@ -895,10 +903,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 currentX = firstRun.Size.Width + 0.5;
 
-                for (var i = 0; i < secondRun.GlyphRun.GlyphClusters.Count; i++)
+                for (var i = 0; i < secondRun.GlyphRun.GlyphInfos.Count; i++)
                 {
-                    var cluster = secondRun.GlyphRun.GlyphClusters[i];
-                    var advance = secondRun.GlyphRun.GlyphAdvances[i];
+                    var cluster = secondRun.GlyphRun.GlyphInfos[i].GlyphCluster;
+                    var advance = secondRun.GlyphRun.GlyphInfos[i].GlyphAdvance;
 
                     hit = layout.HitTestPoint(new Point(currentX, 0));
 
@@ -932,7 +940,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var firstRun = (ShapedTextRun)textLine.TextRuns[0];
 
-                var firstCluster = firstRun.ShapedBuffer.GlyphClusters[0];
+                var firstCluster = firstRun.ShapedBuffer.GlyphInfos[0].GlyphCluster;
 
                 var characterHit = textLine.GetCharacterHitFromDistance(0);
 
@@ -946,7 +954,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(characterHit.FirstCharacterIndex));
 
-                var firstAdvance = firstRun.ShapedBuffer.GlyphAdvances[0];
+                var firstAdvance = firstRun.ShapedBuffer.GlyphInfos[0].GlyphAdvance;
 
                 Assert.Equal(firstAdvance, distance, 5);
 
@@ -972,13 +980,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var graphemeEnumerator = new GraphemeEnumerator(text);
 
-                while (graphemeEnumerator.MoveNext())
+                while (graphemeEnumerator.MoveNext(out var grapheme))
                 {
-                    var grapheme = graphemeEnumerator.Current;
-
-                    var textStyleOverrides = new[] { new ValueSpan<TextRunProperties>(i, grapheme.Text.Length, new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Red)) };
+                    var textStyleOverrides = new[] { new ValueSpan<TextRunProperties>(i, grapheme.Length, new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Red)) };
 
-                    i += grapheme.Text.Length;
+                    i += grapheme.Length;
 
                     var layout = new TextLayout(
                         text,
@@ -991,9 +997,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var shapedRuns = textLine.TextRuns.Cast<ShapedTextRun>().ToList();
 
-                    var clusters = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphClusters).ToList();
+                    var clusters = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphInfos, (_, glyph) => glyph.GlyphCluster).ToList();
 
-                    var glyphAdvances = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphAdvances).ToList();
+                    var glyphAdvances = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphInfos, (_, glyph) => glyph.GlyphAdvance).ToList();
 
                     var currentX = 0.0;
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
index 6993c70e8b..544b84912e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
@@ -95,9 +95,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 {
                     var shapedRun = (ShapedTextRun)textRun;
 
-                    clusters.AddRange(shapedRun.IsReversed ?
-                        shapedRun.ShapedBuffer.GlyphClusters.Reverse() :
-                        shapedRun.ShapedBuffer.GlyphClusters);
+                    var runClusters = shapedRun.ShapedBuffer.GlyphInfos.Select(glyph => glyph.GlyphCluster);
+
+                    clusters.AddRange(shapedRun.IsReversed ? runClusters.Reverse() : runClusters);
                 }
 
                 var nextCharacterHit = new CharacterHit(0, clusters[1] - clusters[0]);
@@ -142,9 +142,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 {
                     var shapedRun = (ShapedTextRun)textRun;
 
-                    clusters.AddRange(shapedRun.IsReversed ?
-                        shapedRun.ShapedBuffer.GlyphClusters.Reverse() :
-                        shapedRun.ShapedBuffer.GlyphClusters);
+                    var runClusters = shapedRun.ShapedBuffer.GlyphInfos.Select(glyph => glyph.GlyphCluster);
+
+                    clusters.AddRange(shapedRun.IsReversed ? runClusters.Reverse() : runClusters);
                 }
 
                 clusters.Reverse();
@@ -247,7 +247,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     formatter.FormatLine(textSource, 0, double.PositiveInfinity,
                         new GenericTextParagraphProperties(defaultProperties));
 
-                var clusters = textLine.TextRuns.Cast<ShapedTextRun>().SelectMany(x => x.ShapedBuffer.GlyphClusters)
+                var clusters = textLine.TextRuns
+                    .Cast<ShapedTextRun>()
+                    .SelectMany(x => x.ShapedBuffer.GlyphInfos, (_, glyph) => glyph.GlyphCluster)
                     .ToArray();
 
                 var previousCharacterHit = new CharacterHit(text.Length);
@@ -313,11 +315,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var glyphRun = textRun.GlyphRun;
 
-                    for (var i = 0; i < glyphRun.GlyphClusters!.Count; i++)
+                    for (var i = 0; i < glyphRun.GlyphInfos.Count; i++)
                     {
-                        var cluster = glyphRun.GlyphClusters[i];
+                        var cluster = glyphRun.GlyphInfos[i].GlyphCluster;
 
-                        var advance = glyphRun.GlyphAdvances[i];
+                        var advance = glyphRun.GlyphInfos[i].GlyphAdvance;
 
                         var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
 
@@ -750,7 +752,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             {
                 var shapedBuffer = textRun.ShapedBuffer;
 
-                var currentClusters = shapedBuffer.GlyphClusters.ToList();
+                var currentClusters = shapedBuffer.GlyphInfos.Select(glyph => glyph.GlyphCluster).ToList();
 
                 foreach (var currentCluster in currentClusters)
                 {
@@ -783,11 +785,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             {
                 var shapedBuffer = textRun.ShapedBuffer;
 
-                for (var index = 0; index < shapedBuffer.GlyphAdvances.Count; index++)
+                for (var index = 0; index < shapedBuffer.GlyphInfos.Length; index++)
                 {
-                    var currentCluster = shapedBuffer.GlyphClusters[index];
+                    var currentCluster = shapedBuffer.GlyphInfos[index].GlyphCluster;
 
-                    var advance = shapedBuffer.GlyphAdvances[index];
+                    var advance = shapedBuffer.GlyphInfos[index].GlyphAdvance;
 
                     if (lastCluster != currentCluster)
                     {
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
index 834dce4a90..3f02867aa9 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextShaperTests.cs
@@ -19,10 +19,10 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var shapedBuffer = TextShaper.Current.ShapeText(text, options);
                 
                 Assert.Equal(shapedBuffer.Length, text.Length);
-                Assert.Equal(shapedBuffer.GlyphClusters.Count, text.Length);
-                Assert.Equal(0, shapedBuffer.GlyphClusters[0]);
-                Assert.Equal(1, shapedBuffer.GlyphClusters[1]);
-                Assert.Equal(1, shapedBuffer.GlyphClusters[2]);
+                Assert.Equal(shapedBuffer.GlyphInfos.Length, text.Length);
+                Assert.Equal(0, shapedBuffer.GlyphInfos[0].GlyphCluster);
+                Assert.Equal(1, shapedBuffer.GlyphInfos[1].GlyphCluster);
+                Assert.Equal(1, shapedBuffer.GlyphInfos[2].GlyphCluster);
             }
         }
 
@@ -36,7 +36,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var shapedBuffer = TextShaper.Current.ShapeText(text, options);
 
                 Assert.Equal(shapedBuffer.Length, text.Length);
-                Assert.Equal(100, shapedBuffer.GlyphAdvances[0]);
+                Assert.Equal(100, shapedBuffer.GlyphInfos[0].GlyphAdvance);
             }
         }
 
diff --git a/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs b/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
index 566cb0f1ac..0448ecd41f 100644
--- a/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/HarfBuzzTextShaperImpl.cs
@@ -52,6 +52,8 @@ namespace Avalonia.UnitTests
 
                 var shapedBuffer = new ShapedBuffer(text, bufferLength, typeface, fontRenderingEmSize, bidiLevel);
 
+                var targetInfos = shapedBuffer.GlyphInfos;
+
                 var glyphInfos = buffer.GetGlyphInfoSpan();
 
                 var glyphPositions = buffer.GetGlyphPositionSpan();
@@ -77,9 +79,7 @@ namespace Avalonia.UnitTests
                             4 * typeface.GetGlyphAdvance(glyphIndex) * textScale;
                     }
 
-                    var targetInfo = new Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
-
-                    shapedBuffer[i] = targetInfo;
+                    targetInfos[i] = new Media.TextFormatting.GlyphInfo(glyphIndex, glyphCluster, glyphAdvance, glyphOffset);
                 }
 
                 return shapedBuffer;
@@ -161,6 +161,8 @@ namespace Avalonia.UnitTests
 
             if (MemoryMarshal.TryGetArray(memory, out var segment))
             {
+                start = segment.Offset;
+                length = segment.Count;
                 return segment.Array.AsMemory();
             }
 
diff --git a/tests/Avalonia.UnitTests/MockGlyphRun.cs b/tests/Avalonia.UnitTests/MockGlyphRun.cs
index f525e4736b..477f34565f 100644
--- a/tests/Avalonia.UnitTests/MockGlyphRun.cs
+++ b/tests/Avalonia.UnitTests/MockGlyphRun.cs
@@ -1,10 +1,27 @@
 using System.Collections.Generic;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
 
 namespace Avalonia.UnitTests
 {
     public class MockGlyphRun : IGlyphRunImpl
     {
+        public MockGlyphRun(IReadOnlyList<GlyphInfo> glyphInfos)
+        {
+            var width = 0.0;
+
+            for (var i = 0; i < glyphInfos.Count; ++i)
+            {
+                width += glyphInfos[i].GlyphAdvance;
+            }
+
+            Size = new Size(width, 10);
+        }
+
+        public Size Size { get; }
+
+        public Point BaselineOrigin => new Point(0, 8);
+
         public void Dispose()
         {
             
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index f9e1e45098..93073faefb 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -4,6 +4,7 @@ using System.IO;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Rendering;
 using Moq;
 
@@ -57,6 +58,8 @@ namespace Avalonia.UnitTests
             return new MockRenderTarget();
         }
 
+        public bool IsLost => false;
+
         public object TryGetFeature(Type featureType) => null;
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
@@ -146,9 +149,10 @@ namespace Avalonia.UnitTests
             throw new NotImplementedException();
         }
 
-        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, IReadOnlyList<ushort> glyphIndices, IReadOnlyList<double> glyphAdvances, IReadOnlyList<Vector> glyphOffsets)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize, 
+            IReadOnlyList<GlyphInfo> glyphInfos, Point baselineOrigin)
         {
-            return Mock.Of<IGlyphRunImpl>();
+            return new MockGlyphRun(glyphInfos);
         }
 
         public IPlatformRenderInterfaceContext CreateBackendContext(IPlatformGraphicsContext graphicsContext) => this;
diff --git a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
index 3218139251..b810caabd9 100644
--- a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
@@ -13,6 +13,7 @@ namespace Avalonia.UnitTests
             var fontRenderingEmSize = options.FontRenderingEmSize;
             var bidiLevel = options.BidiLevel;
             var shapedBuffer = new ShapedBuffer(text, text.Length, typeface, fontRenderingEmSize, bidiLevel);
+            var targetInfos = shapedBuffer.GlyphInfos;
             var textSpan = text.Span;
             var textStartIndex = TextTestHelper.GetStartCharIndex(text);
 
@@ -24,7 +25,10 @@ namespace Avalonia.UnitTests
 
                 var glyphIndex = typeface.GetGlyph(codepoint);
 
-                shapedBuffer[i] = new GlyphInfo(glyphIndex, glyphCluster, 10);
+                for (var j = 0; j < count; ++j)
+                {
+                    targetInfos[i + j] = new GlyphInfo(glyphIndex, glyphCluster, 10);
+                }
 
                 i += count;
             }
diff --git a/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png
index 407b67b8a0..547e9b2763 100644
Binary files a/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png and b/tests/TestFiles/Skia/Media/GlyphRun/Should_Render_GlyphRun_Geometry.expected.png differ