Merge branch '1.x' into 2.x

# Conflicts:
#	composer.lock

Author: timkelty

composer.json

@@ -17,7 +17,7 @@
     "99designs/http-signatures": "^4.0",
     "symfony/process": "^6",
     "aws/aws-sdk-php": "^3.342.6",
-    "craftcms/yii2-cache-cascade": "^1.2"
+    "craftcms/yii2-cache-cascade": "^1.2.1"
   },
   "require-dev": {
     "craftcms/ecs": "dev-main",