diff --git a/build/ApiDiff.props b/build/ApiDiff.props
index da82fbcc51..3d322f56d5 100644
--- a/build/ApiDiff.props
+++ b/build/ApiDiff.props
@@ -7,6 +7,6 @@
     <ItemGroup>
       <PackageDownload Include="$(NugetPackageName)" Version="[$(ApiContractPackageVersion)]" />
       <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20372.2" PrivateAssets="All" />
-    <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(NugetPackageName.ToLower())\$(ApiContractPackageVersion)\lib\$(TargetFramework)\$(AssemblyName).dll" />
+      <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(NugetPackageName.ToLowerInvariant())\$(ApiContractPackageVersion)\lib\$(TargetFramework)\$(AssemblyName).dll" />
     </ItemGroup>
 </Project>
diff --git a/src/Avalonia.OpenGL/Egl/EglContext.cs b/src/Avalonia.OpenGL/Egl/EglContext.cs
index 5365354418..249b4d547f 100644
--- a/src/Avalonia.OpenGL/Egl/EglContext.cs
+++ b/src/Avalonia.OpenGL/Egl/EglContext.cs
@@ -73,7 +73,8 @@ namespace Avalonia.OpenGL.Egl
                 var old = new RestoreContext(_egl, _disp.Handle, _lock);
                 var surf = surface ?? OffscreenSurface;
                 _egl.MakeCurrent(_disp.Handle, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
-                if (!_egl.MakeCurrent(_disp.Handle, surf.DangerousGetHandle(), surf.DangerousGetHandle(), Context))
+                if (!_egl.MakeCurrent(_disp.Handle, surf?.DangerousGetHandle() ?? IntPtr.Zero,
+                    surf?.DangerousGetHandle() ?? IntPtr.Zero, Context))
                     throw OpenGlException.GetFormattedException("eglMakeCurrent", _egl);
                 success = true;
                 return old;
diff --git a/src/Avalonia.OpenGL/Egl/EglDisplay.cs b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
index fd3de854f5..623364866b 100644
--- a/src/Avalonia.OpenGL/Egl/EglDisplay.cs
+++ b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
@@ -158,15 +158,21 @@ namespace Avalonia.OpenGL.Egl
             var ctx = _egl.CreateContext(_display, _config, shareCtx?.Context ?? IntPtr.Zero, _contextAttributes);
             if (ctx == IntPtr.Zero)
                 throw OpenGlException.GetFormattedException("eglCreateContext", _egl);
-            var surf = _egl.CreatePBufferSurface(_display, _config, new[]
+            
+            var extensions = _egl.QueryString(Handle, EGL_EXTENSIONS);
+            
+            IntPtr surf = IntPtr.Zero;
+            if (extensions?.Contains("EGL_KHR_surfaceless_context") != true)
             {
-                EGL_WIDTH, 1,
-                EGL_HEIGHT, 1,
-                EGL_NONE
-            });
-            if (surf == IntPtr.Zero)
-                throw OpenGlException.GetFormattedException("eglCreatePBufferSurface", _egl);
-            var rv = new EglContext(this, _egl, shareCtx, ctx, context => new EglSurface(this, context, surf),
+                surf = _egl.CreatePBufferSurface(_display, _config,
+                    new[] { EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE });
+                if (surf == IntPtr.Zero)
+                    throw OpenGlException.GetFormattedException("eglCreatePBufferSurface", _egl);
+            }
+
+            var rv = new EglContext(this, _egl, shareCtx, ctx,
+                context =>
+                    surf == IntPtr.Zero ? null : new EglSurface(this, context, surf),
                 _version, _sampleCount, _stencilSize);
             return rv;
         }
diff --git a/src/Avalonia.Themes.Fluent/Button.xaml b/src/Avalonia.Themes.Fluent/Button.xaml
index 8522c933ae..573b9f337f 100644
--- a/src/Avalonia.Themes.Fluent/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Button.xaml
@@ -32,7 +32,6 @@
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                          CornerRadius="{DynamicResource ControlCornerRadius}"
                           Padding="{TemplateBinding Padding}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
@@ -95,4 +94,8 @@
     <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
     <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
   </Style>
+  
+  <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/CheckBox.xaml b/src/Avalonia.Themes.Fluent/CheckBox.xaml
index 678ae5c5a3..83d2779872 100644
--- a/src/Avalonia.Themes.Fluent/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/CheckBox.xaml
@@ -22,16 +22,14 @@
                   Grid.ColumnSpan="2"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}" />
+                  BorderThickness="{TemplateBinding BorderThickness}" />
 
           <Grid VerticalAlignment="Top" Height="32">
             <Border x:Name="NormalRectangle"
                 BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
                 UseLayoutRounding="False"
                 Height="20"
-                Width="20"
-                CornerRadius="{DynamicResource ControlCornerRadius}" />
+                Width="20" />
 
             <Viewbox UseLayoutRounding="False">
               <Panel>
@@ -52,6 +50,14 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  
+  <Style Selector="CheckBox /template/ Border#PART_Border">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+
+  <Style Selector="CheckBox /template/ Border#NormalRectangle">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
   <!-- Unchecked Normal State -->
   <Style Selector="CheckBox">
diff --git a/src/Avalonia.Themes.Fluent/ComboBox.xaml b/src/Avalonia.Themes.Fluent/ComboBox.xaml
index f77f1b582b..8155264f18 100644
--- a/src/Avalonia.Themes.Fluent/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/ComboBox.xaml
@@ -61,7 +61,6 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}"
                   MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
 
           <Border x:Name="HighlightBackground"
@@ -70,8 +69,7 @@
                   Grid.ColumnSpan="2"
                   Background="{DynamicResource ComboBoxBackgroundUnfocused}"
                   BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}" />
+                  BorderThickness="{TemplateBinding BorderThickness}" />
           <TextBlock x:Name="PlaceholderTextBlock"
                      Grid.Row="1"
                      Grid.Column="0"
@@ -226,4 +224,12 @@
   <Style Selector="ComboBox:focused:pressed /template/ Path#DropDownGlyph">
     <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
   </Style>
+  
+  <Style Selector="ComboBox /template/ Border#Background">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+  
+  <Style Selector="ComboBox /template/ Border#HighlightBackground">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/RadioButton.xaml b/src/Avalonia.Themes.Fluent/RadioButton.xaml
index 078f51c87a..2847d1fa5a 100644
--- a/src/Avalonia.Themes.Fluent/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/RadioButton.xaml
@@ -25,8 +25,7 @@
         <Border Name="RootBorder"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{DynamicResource ControlCornerRadius}">
+                BorderThickness="{TemplateBinding BorderThickness}">
           <Grid ColumnDefinitions="20,*">
             <Grid VerticalAlignment="Top"
               Height="32">
@@ -77,6 +76,10 @@
     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" />
     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" />
   </Style>
+  
+  <Style Selector="RadioButton /template/ Border#RootBorder">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
 
   <!-- PointerOver State -->
diff --git a/src/Avalonia.Themes.Fluent/TabItem.xaml b/src/Avalonia.Themes.Fluent/TabItem.xaml
index 2b0a0c1ea0..1c9574f169 100644
--- a/src/Avalonia.Themes.Fluent/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/TabItem.xaml
@@ -39,7 +39,6 @@
                               TextBlock.FontSize="{TemplateBinding FontSize}"
                               TextBlock.FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
-                    CornerRadius="{DynamicResource ControlCornerRadius}"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
           </Panel>
         </Border>
@@ -53,6 +52,7 @@
   </Style>
   <Style Selector="TabItem /template/ Border#PART_SelectedPipe">
     <Setter Property="IsVisible" Value="False" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
   </Style>
 
   <!-- Selected state -->
diff --git a/src/Avalonia.Themes.Fluent/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/TabStripItem.xaml
index 628ab8dddd..78ef102705 100644
--- a/src/Avalonia.Themes.Fluent/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/TabStripItem.xaml
@@ -38,7 +38,6 @@
                               TextBlock.FontSize="{TemplateBinding FontSize}"
                               TextBlock.FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
-                    CornerRadius="{DynamicResource ControlCornerRadius}"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
           </Panel>
         </Border>
@@ -46,6 +45,9 @@
     </Setter>
   </Style>
 
+  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
   <!--  Nornal state  -->
   <Style Selector="TabStripItem /template/ Border#PART_LayoutRoot">
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index 85364bffea..162835ae10 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -52,7 +52,6 @@
               Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{DynamicResource ControlCornerRadius}"
               MinWidth="{TemplateBinding MinWidth}"
               MinHeight="{TemplateBinding MinHeight}">
             </Border>
@@ -156,6 +155,10 @@
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
   </Style>
 
+  <Style Selector="TextBox /template/ Border#PART_BorderElement">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+
   <Style Selector="TextBox /template/ DockPanel#PART_InnerDockPanel">
     <Setter Property="Cursor" Value="IBeam" />
   </Style>
diff --git a/src/Avalonia.Themes.Fluent/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/ToggleButton.xaml
index 49e2280a6d..dd8e51e4e5 100644
--- a/src/Avalonia.Themes.Fluent/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/ToggleButton.xaml
@@ -29,7 +29,6 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{DynamicResource ControlCornerRadius}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
@@ -38,6 +37,10 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  
+  <Style Selector="ToggleButton /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
   <Style Selector="ToggleButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
index 155339b985..66a8c1dd0c 100644
--- a/src/Avalonia.Visuals/Media/GlyphRun.cs
+++ b/src/Avalonia.Visuals/Media/GlyphRun.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Media
         private double _fontRenderingEmSize;
         private Size? _size;
         private int _biDiLevel;
-        private Point _baselineOrigin;
+        private Point? _baselineOrigin;
 
         private ReadOnlySlice<ushort> _glyphIndices;
         private ReadOnlySlice<double> _glyphAdvances;
@@ -97,7 +97,9 @@ namespace Avalonia.Media
         {
             get
             {
-                return _baselineOrigin;
+                _baselineOrigin ??= CalculateBaselineOrigin();
+
+                return _baselineOrigin.Value;
             }
             set => Set(ref _baselineOrigin, value);
         }
@@ -538,6 +540,15 @@ namespace Avalonia.Media
             return GlyphAdvances[index];
         }
 
+        /// <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.Ascent * Scale);
+        }
+
         /// <summary>
         /// Calculates the size of the <see cref="GlyphRun"/>.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
index 4a7282af27..394dae8253 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
@@ -126,7 +126,15 @@ namespace Avalonia.Media.TextFormatting
 
             var lastCluster = glyphRun.GlyphClusters[glyphCount];
 
-            count = lastCluster - firstCluster;
+            if (glyphRun.IsLeftToRight)
+            {
+                count = lastCluster - firstCluster;
+            }
+            else
+            {
+                count = firstCluster - lastCluster;
+            }
+           
 
             return count > 0;
         }
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
index d13b4836ea..fc98e9f6f8 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Media.TextFormatting
 
             foreach (var textRun in _textRuns)
             {
-                var offsetY = LineMetrics.TextBaseline;
+                var offsetY = LineMetrics.TextBaseline - textRun.GlyphRun.BaselineOrigin.Y;
 
                 using (drawingContext.PushPostTransform(Matrix.CreateTranslation(currentX, offsetY)))
                 {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 72eed9e543..dc44d2d55f 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -141,17 +141,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             _platformGl = new EglPlatformOpenGlInterface(_eglDisplay);
             _eglSurface =  _platformGl.CreateWindowSurface(_gbmTargetSurface);
 
-
-            EglContext CreateContext(EglContext share)
-            {
-                var offSurf = gbm_surface_create(device, 1, 1, GbmColorFormats.GBM_FORMAT_XRGB8888,
-                    GbmBoFlags.GBM_BO_USE_RENDERING);
-                if (offSurf == null)
-                    throw new InvalidOperationException("Unable to create 1x1 sized GBM surface");
-                return _eglDisplay.CreateContext(share, _platformGl.CreateWindowSurface(offSurf));
-            }
-            
-            _deferredContext = CreateContext(null);
+            _deferredContext = _platformGl.PrimaryEglContext;
 
             using (_deferredContext.MakeCurrent(_eglSurface))
             {
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 9a486b60aa..cbc896813f 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -42,6 +42,11 @@ namespace Avalonia.Skia
         /// </summary>
         public struct CreateInfo
         {
+            /// <summary>
+            /// Canvas to draw to.
+            /// </summary>
+            public SKCanvas Canvas;
+
             /// <summary>
             /// Surface to draw to.
             /// </summary>
@@ -89,7 +94,7 @@ namespace Avalonia.Skia
             if (_grContext != null)
                 Monitor.Enter(_grContext);
             Surface = createInfo.Surface;
-            Canvas = createInfo.Surface.Canvas;
+            Canvas = createInfo.Canvas ?? createInfo.Surface?.Canvas;
 
             if (Canvas == null)
             {
diff --git a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
new file mode 100644
index 0000000000..72438609d5
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
@@ -0,0 +1,31 @@
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using SkiaSharp;
+
+namespace Avalonia.Skia.Helpers
+{
+    public class DrawingContextHelper
+    {
+        /// <summary>
+        /// Wrap Skia canvas in drawing context so we can use Avalonia api to render to external skia canvas
+        /// this is useful in scenarios where canvas is not controlled by application, but received from another non avalonia api
+        /// like: SKCanvas canvas = SKDocument.BeginPage(...);
+        /// </summary>
+        /// <param name="canvas"></param>
+        /// <param name="dpi"></param>
+        /// <param name="visualBrushRenderer"></param>
+        /// <returns>DrawingContext</returns>
+        public static IDrawingContextImpl WrapSkiaCanvas(SKCanvas canvas, Vector dpi, IVisualBrushRenderer visualBrushRenderer = null)
+        {
+            var createInfo = new DrawingContextImpl.CreateInfo
+            {
+                Canvas = canvas,
+                Dpi = dpi,
+                VisualBrushRenderer = visualBrushRenderer,
+                DisableTextLcdRendering = true,
+            };
+
+            return new DrawingContextImpl(createInfo);
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index 61075171fe..31724bfee9 100644
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -64,7 +64,8 @@ namespace Avalonia.Skia
                     new ReadOnlySlice<double>(glyphAdvances),
                     new ReadOnlySlice<Vector>(glyphOffsets),
                     text,
-                    new ReadOnlySlice<ushort>(clusters));
+                    new ReadOnlySlice<ushort>(clusters),
+                    buffer.Direction == Direction.LeftToRight ? 0 : 1);
             }
         }