Merge branch '5.5'

diff --cc package-lock.json
index 87d4fdd4231f85e78b26c99017de46663f9b8a8d,54abfc0474b40d879e63e4946ad0645542c24f7b..f9a4a69d44c0e782e5c6a60ec8e091190be7ef6e
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -12,7 -12,8 +12,7 @@@
          "@typescript-eslint/parser": "^6.2.1",
          "eslint": "^8.46.0",
          "eslint-config-prettier": "^8.9.0",
-         "prettier": "^2.8.8",
+         "prettier": "^3.0.2",
 -        "tslib": "^2.6.0",
          "typescript": "^5.1.6"
        }
      },

diff --cc package.json
index 138f751b9dc9fc23f2396c2e4c9e2362739b6bbf,f1b079b9f3d616ada57e65c4cce048db9306c378..455d4ebf8afb062495113284c5d247600f3c32e9
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -4,7 -4,8 +4,7 @@@
      "@typescript-eslint/parser": "^6.2.1",
      "eslint": "^8.46.0",
      "eslint-config-prettier": "^8.9.0",
-     "prettier": "^2.8.8",
+     "prettier": "^3.0.2",
 -    "tslib": "^2.6.0",
      "typescript": "^5.1.6"
    },
    "dependencies": {