Merge branch 'release/11.0' into v11/dev

# Conflicts:
#	version.json

src/Umbraco.Core/Extensions/ContentExtensions.cs

@@ -269,11 +269,17 @@ public static class ContentExtensions
     /// </summary>
     /// <param name="content"><see cref="IContent" /> to retrieve ancestors for</param>
     /// <returns>An Enumerable list of integer ids</returns>
-    public static IEnumerable<int>? GetAncestorIds(this IContent content) =>
-        content.Path?.Split(Constants.CharArrays.Comma)
+    public static IEnumerable<int>? GetAncestorIds(this IContent content)
+    {
+        if (string.IsNullOrWhiteSpace(content.Path))
+        {
+            return null;
+        }
+
+        return content.Path.Split(Constants.CharArrays.Comma)
             .Where(x => x != Constants.System.RootString && x != content.Id.ToString(CultureInfo.InvariantCulture))
-            .Select(s =>
-                int.Parse(s, CultureInfo.InvariantCulture));
+            .Select(s => int.Parse(s, CultureInfo.InvariantCulture));
+    }
 
     #endregion
 

src/Umbraco.Core/Models/ContentEditing/ContentItemDisplay.cs

@@ -201,7 +201,7 @@ public class ContentItemDisplay<TVariant> :
     /// </summary>
     [DataMember(Name = "metaData")]
     [ReadOnly(true)]
-    public IDictionary<string, object>? AdditionalData { get; private set; }
+    public IDictionary<string, object> AdditionalData { get; private set; } = new Dictionary<string, object>();
 
     /// <summary>
     ///     This is used for validation of a content item.

src/Umbraco.Web.BackOffice/Controllers/BlockGridSampleHelper.cs

@@ -172,7 +172,7 @@ public sealed class BlockGridSampleHelper
     internal void CreateSamplePartialViews()
     {
         var embeddedBasePath = $"{_partialViewPopulator.CoreEmbeddedPath}.BlockGrid.Components";
-        var fileSystemBasePath = "/Views/partials/blockgrid/Components";
+        var fileSystemBasePath = "/Views/Partials/blockgrid/Components";
         var filesToMove = new[]
         {
             "umbBlockGridDemoHeadlineBlock.cshtml",