Merge branch 'main' into feature/6014-vite-sec-vul

conflicts
- package-lock.json: accept incoming changes that use a new patch version

Author: ethan-mfb

package-lock.json

@@ -50,7 +50,7 @@
     "@testing-library/react": "12.1.5",
     "@types/jest": "29.5.12",
     "@types/node": "18.19.31",
-    "@types/react": "17.0.82",
+    "@types/react": "17.0.83",
     "eslint": "8.57.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "29.7.0",