diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml
index 03790dbe7b1..4fad111036d 100644
--- a/.github/workflows/functional_all_db.yml
+++ b/.github/workflows/functional_all_db.yml
@@ -31,7 +31,7 @@ jobs:
         github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-24.04
     container:
-      image: cypress/included:15.5.0
+      image: cypress/included:15.6.0
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
     - uses: ./.github/actions/setup-dotnet
@@ -59,7 +59,7 @@ jobs:
         github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-24.04
     container:
-      image: cypress/included:15.5.0
+      image: cypress/included:15.6.0
     env:
       OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
     steps:
@@ -87,7 +87,7 @@ jobs:
         github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-24.04
     container:
-      image: cypress/included:15.5.0
+      image: cypress/included:15.6.0
     services:
       postgres:
         image: postgres:11
@@ -130,7 +130,7 @@ jobs:
         github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-24.04
     container:
-      image: cypress/included:15.5.0
+      image: cypress/included:15.6.0
     services:
       mysql:
         image: mysql:8
@@ -169,7 +169,7 @@ jobs:
         github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-24.04
     container:
-      image: cypress/included:15.5.0
+      image: cypress/included:15.6.0
     services:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-latest
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2e263ae7c1d..a1ffd089837 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -18,7 +18,7 @@
     <PackageVersion Include="Castle.Core" Version="5.2.1" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.3.0" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.19.12" />
-    <PackageVersion Include="Fluid.Core" Version="2.30.0" />
+    <PackageVersion Include="Fluid.Core" Version="2.31.0" />
     <PackageVersion Include="GraphQL" Version="8.7.0" />
     <PackageVersion Include="GraphQL.DataLoader" Version="8.7.0" />
     <PackageVersion Include="GraphQL.MicrosoftDI" Version="8.7.0" />
@@ -62,8 +62,8 @@
     <PackageVersion Include="StackExchange.Redis" Version="2.9.32" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
-    <PackageVersion Include="xunit.v3" Version="3.1.0" />
-    <PackageVersion Include="xunit.analyzers" Version="1.24.0" />
+    <PackageVersion Include="xunit.v3" Version="3.2.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.25.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="YesSql" Version="5.4.7" />
     <PackageVersion Include="YesSql.Abstractions" Version="5.4.7" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs
index 409b3a29f12..9f038acdd0d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs
@@ -17,7 +17,7 @@
 using OrchardCore.Shortcodes.Models;
 using OrchardCore.Shortcodes.Services;
 using OrchardCore.Shortcodes.ViewModels;
-using Parlot;
+using Shortcodes;
 
 namespace OrchardCore.Shortcodes.Controllers;
 
@@ -347,7 +347,16 @@ public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<st
 
     private static bool IsValidShortcodeName(string name)
     {
-        var scanner = new Scanner(name);
-        return scanner.ReadIdentifier(out var result) && name.Length == result.Length;
+        try
+        {
+            var nodes = new ShortcodesParser().Parse($"[{name}]");
+            return nodes.Count == 1 &&
+                nodes[0] is Shortcode shortcodeNode &&
+                shortcodeNode.Identifier.Equals(name, StringComparison.OrdinalIgnoreCase);
+        }
+        catch (Exception)
+        {
+            return false;
+        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs
index b11cecb7d45..214af36777b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs
@@ -44,7 +44,7 @@ public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArgument
                 return FluidValue.Create(missingUsers.Concat(cachedUsers).ToList(), ctx.Options);
             }
 
-            return NilValue.Empty;
+            return EmptyValue.Instance;
         }
 
         if (input.Type == FluidValues.Array)
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs
index 75caff2d8c9..e629d5eb714 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs
@@ -91,15 +91,4 @@ public override void WriteTo(TextWriter writer, TextEncoder encoder, CultureInfo
     {
         _value.WriteTo(writer, (HtmlEncoder)encoder);
     }
-
-    [Obsolete("GetValue is obsolete, prefer the GetValueAsync method.")]
-    protected override FluidValue GetValue(string name, TemplateContext context)
-    {
-        return NilValue.Instance;
-    }
-
-    protected override FluidValue GetIndex(FluidValue index, TemplateContext context)
-    {
-        return NilValue.Instance;
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Values/StringValuesValue.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Values/StringValuesValue.cs
index dff13771041..165258c3644 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Values/StringValuesValue.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Values/StringValuesValue.cs
@@ -131,6 +131,7 @@ public override ValueTask<FluidValue> GetValueAsync(string name, TemplateContext
         return NilValue.Instance;
     }
 
+    [Obsolete("This method has been deprecated, please use GetIndexAsync() instead.")]
     protected override FluidValue GetIndex(FluidValue index, TemplateContext context)
     {
         var i = (int)index.ToNumberValue();
@@ -143,6 +144,11 @@ protected override FluidValue GetIndex(FluidValue index, TemplateContext context
         return NilValue.Instance;
     }
 
+    // Using the original method for backward compatibility.
+#pragma warning disable CS0618 // Type or member is obsolete
+    public override ValueTask<FluidValue> GetIndexAsync(FluidValue index, TemplateContext context) => GetIndex(index, context);
+#pragma warning restore CS0618 // Type or member is obsolete
+
     public override bool ToBooleanValue()
         => true;