diff --git a/src/Forms/FormRequestHandler.php b/src/Forms/FormRequestHandler.php
index a646944a090..f2426280325 100644
--- a/src/Forms/FormRequestHandler.php
+++ b/src/Forms/FormRequestHandler.php
@@ -77,7 +77,6 @@ public function __construct(Form $form)
     public function Link($action = null)
     {
         // Forms without parent controller have no link;
-        // E.g. Submission handled via graphql
         $controller = $this->form->getController();
         if (empty($controller)) {
             return null;
diff --git a/src/Forms/GridField/GridField.php b/src/Forms/GridField/GridField.php
index d6039fe4c93..495d0f5efac 100644
--- a/src/Forms/GridField/GridField.php
+++ b/src/Forms/GridField/GridField.php
@@ -146,6 +146,17 @@ class GridField extends FormField
      */
     protected $readonlyComponents = [];
 
+    /**
+     * Intentionally not set to FormField::SCHEMA_DATA_TYPE_STRUCTURAL even though there is no corresponding
+     * react component because we want a hard exception thrown for devleopers to see rather than have
+     * them wonder why the field is not rendering.
+     *
+     * Marked as @interal to allow change in a minor release as a react GridField may be implemented in the future
+     *
+     * @internal
+     */
+    protected $schemaDataType;
+
     /**
      * Pattern used for looking up
      */
diff --git a/src/ORM/Connect/NullDatabase.php b/src/ORM/Connect/NullDatabase.php
index 214998c37e3..0ec62110ccf 100644
--- a/src/ORM/Connect/NullDatabase.php
+++ b/src/ORM/Connect/NullDatabase.php
@@ -8,7 +8,7 @@
 /**
  * Utility class required due to bad coupling in framework.
  * Not every framework execution should require a working database connection.
- * For example, when generating class and config manifests for deployment bundles,
+ * For example, when generating class and config manifests for deployment bundles
  * or when generating code in a silverstripe/graphql schema build.
  *
  * This class creates the required no-ops to fulfill the contract,
diff --git a/tests/php/Control/Middleware/CanonicalURLMiddlewareTest.php b/tests/php/Control/Middleware/CanonicalURLMiddlewareTest.php
index 2770874ab88..e68af11bae5 100644
--- a/tests/php/Control/Middleware/CanonicalURLMiddlewareTest.php
+++ b/tests/php/Control/Middleware/CanonicalURLMiddlewareTest.php
@@ -182,7 +182,6 @@ public function testRedirectTrailingSlashIgnorePaths(bool $addTrailingSlash, boo
         $requestSlash = $requestHasSlash ? '/' : '';
         $noRedirectPaths = [
             "/admin{$requestSlash}",
-            "/admin/graphql{$requestSlash}",
             "/dev/tasks/my-task{$requestSlash}",
         ];
         $allowRedirectPaths = [