diff --git a/api/Avalonia.nupkg.xml b/api/Avalonia.nupkg.xml
new file mode 100644
index 0000000000..6a7d53544e
--- /dev/null
+++ b/api/Avalonia.nupkg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>P:Avalonia.Rendering.Composition.ICompositionGpuImportedObject.ImportCompleted</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs b/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
index ce728f86a2..31cbaf2a29 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Rendering.Composition;
+
+[NotClientImplementable]
 public interface ICompositionGpuInterop
 {
     /// <summary>
@@ -84,14 +87,22 @@ public enum CompositionGpuImportedImageSynchronizationCapabilities
 /// <summary>
 /// An imported GPU object that's usable by composition APIs 
 /// </summary>
+[NotClientImplementable]
 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
+    /// sharing handle was used.
     /// </summary>
+    Task ImportCompleted { get; }
+    
+    /// <inheritdoc cref="ImportCompleted"/>
+    /// <seealso cref="ImportCompleted">ImportCompleted (recommended replacement)</seealso>
+    [Obsolete("Please use ICompositionGpuImportedObject.ImportCompleted instead")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
     Task ImportCompeted { get; }
+    
     /// <summary>
     /// Indicates if the device context this instance is associated with is no longer available
     /// </summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs b/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
index 1643ec6e8d..12a252ed96 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
@@ -67,18 +67,20 @@ abstract class CompositionGpuImportedObjectBase : ICompositionGpuImportedObject
         Context = context;
         Feature = feature;
         
-        ImportCompeted = Compositor.InvokeServerJobAsync(Import);
+        ImportCompleted = Compositor.InvokeServerJobAsync(Import);
     }
     
     protected abstract void Import();
     public abstract void Dispose();
 
-    public Task ImportCompeted { get; }
+    public Task ImportCompleted { get; }
+
+    public Task ImportCompeted => ImportCompleted;
     public bool IsLost => Context.IsLost;
 
     public ValueTask DisposeAsync() => new(Compositor.InvokeServerJobAsync(() =>
     {
-        if (ImportCompeted.Status == TaskStatus.RanToCompletion)
+        if (ImportCompleted.Status == TaskStatus.RanToCompletion)
             Dispose();
     }));
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
index da24b3812a..f58403f0bc 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
@@ -31,12 +31,12 @@ internal class ServerCompositionDrawingSurface : ServerCompositionSurface, IDisp
             throw new PlatformGraphicsContextLostException();
 
         // This should never happen, but check for it anyway to avoid a deadlock
-        if (!image.ImportCompeted.IsCompleted)
+        if (!image.ImportCompleted.IsCompleted)
             throw new InvalidOperationException("The import operation is not completed yet");
 
         // Rethrow the import here exception
-        if (image.ImportCompeted.IsFaulted)
-            image.ImportCompeted.GetAwaiter().GetResult();
+        if (image.ImportCompleted.IsFaulted)
+            image.ImportCompleted.GetAwaiter().GetResult();
     }
 
     void Update(IBitmapImpl newImage, IPlatformRenderInterfaceContext context)
diff --git a/src/Avalonia.Controls/Utils/StringUtils.cs b/src/Avalonia.Controls/Utils/StringUtils.cs
index 2ea47b442a..0ae1ef0b97 100644
--- a/src/Avalonia.Controls/Utils/StringUtils.cs
+++ b/src/Avalonia.Controls/Utils/StringUtils.cs
@@ -76,7 +76,7 @@ namespace Avalonia.Controls.Utils
             }
 
             var codepoint = new Codepoint(text[index]);
-        
+
             if (!codepoint.IsWhiteSpace)
             {
                 return false;
@@ -85,12 +85,20 @@ namespace Avalonia.Controls.Utils
             // preceeded by lwsp.
             if (index > 0)
             {
-                var nextCodePoint = new Codepoint(text[index + 1]);
+                if (index + 1 < text.Length)
+                {
+                    var nextCodePoint = new Codepoint(text[index + 1]);
 
-                if (nextCodePoint.IsBreakChar)
+                    if (nextCodePoint.IsBreakChar)
+                    {
+                        return true;
+                    }
+                }
+                else
                 {
                     return true;
                 }
+               
             }
 
             switch (codepoint.GeneralCategory)
@@ -125,7 +133,7 @@ namespace Avalonia.Controls.Utils
             }
 
             cursor = Math.Min(cursor, text.Length);
-            
+
             int begin;
             int i;
             int cr;
@@ -181,7 +189,7 @@ namespace Avalonia.Controls.Utils
             {
                 return cursor;
             }
-            
+
             if (cr < text.Length && text[cr] == '\r' && cr + 1 < text.Length && text[cr + 1] == '\n')
             {
                 lf = cr + 1;
@@ -214,9 +222,9 @@ namespace Avalonia.Controls.Utils
             {
                 return i;
             }
-            
+
             var cc = GetCharClass(text[i]);
-            
+
             // skip over the word, punctuation, or run of whitespace
             while (i < cr && GetCharClass(text[i]) == cc)
             {