Merge remote-tracking branch 'origin/v11/dev' into v12/dev

# Conflicts:
#	src/Umbraco.Core/Services/ContentService.cs

src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs

@@ -37,6 +37,7 @@ public static class PublishedModelUtility
         switch (itemType)
         {
             case PublishedItemType.Content:
+            case PublishedItemType.Element:
                 return publishedSnapshot.Content?.GetContentType(alias);
             case PublishedItemType.Media:
                 return publishedSnapshot.Media?.GetContentType(alias);