Merge branch '2.4' into 2

Author: emteknetnz

composer.json

@@ -23,6 +23,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
+        "silverstripe/framework": "^4.10",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "autoload": {