Merge remote-tracking branch 'upstream/pull/5654'

diff --combined yarn.lock
index 78a92e20ea934833a07b2e6f097586b108516d01,5f42ea7f27abd0d44cf72d43b23549a8c2077e2d..61e9852be715942c772716ecf16a604f172ee1eb
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -97,9 -97,9 +97,9 @@@
    integrity sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==
  
  "@stylistic/eslint-plugin-js@^4.0.0":
 -  version "4.1.0"
 -  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.1.0.tgz#cb3fcc6bef022f1af8245a6cda404d290358c260"
 -  integrity sha512-YOe+dChNoR26JVVt+7BjyebsPIQF05OLNmHCXivq8lLZ4ZeVs4+wXaW+pREVboDiAaSRznauAdAU8f+iQouw6Q==
 +  version "4.2.0"
 +  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz#30536fd35dd6aba08c1e234fe37bf66831c6e989"
 +  integrity sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==
    dependencies:
      eslint-visitor-keys "^4.2.0"
      espree "^10.3.0"
@@@ -509,6 -509,11 +509,11 @@@ lodash.merge@^4.6.2
    resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
    integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
  
+ make-plural@^7.4.0:
+   version "7.4.0"
+   resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.4.0.tgz#fa6990dd550dea4de6b20163f74e5ed83d8a8d6d"
+   integrity sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg==
+ 
  minimatch@^3.1.2:
    version "3.1.2"
    resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"