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

diff --combined yarn.lock
index db07fe3fd6b1c702409ab18e3669e00d98ce652c,2d6a62d123deb312ed7828fb37d539f18f9c5779..c6e4899ffb4c122764cb7056c3a078878a3f73aa
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -29,10 -29,10 +29,10 @@@
      minimatch "^3.1.2"
      strip-json-comments "^3.1.1"
  
- "@eslint/js@8.38.0":
-   version "8.38.0"
-   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.38.0.tgz#73a8a0d8aa8a8e6fe270431c5e72ae91b5337892"
-   integrity sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==
+ "@eslint/js@8.39.0":
+   version "8.39.0"
+   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
+   integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
  
  "@humanwhocodes/config-array@^0.11.8":
    version "0.11.8"
@@@ -205,10 -205,10 +205,10 @@@ escape-string-regexp@^4.0.0
    resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
    integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
  
- eslint-scope@^7.1.1:
-   version "7.1.1"
-   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-   integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+ eslint-scope@^7.2.0:
+   version "7.2.0"
+   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+   integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
    dependencies:
      esrecurse "^4.3.0"
      estraverse "^5.2.0"
@@@ -219,14 -219,14 +219,14 @@@ eslint-visitor-keys@^3.3.0, eslint-visi
    integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
  
  eslint@^8.0.0:
-   version "8.38.0"
-   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.38.0.tgz#a62c6f36e548a5574dd35728ac3c6209bd1e2f1a"
-   integrity sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==
+   version "8.39.0"
+   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
+   integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==
    dependencies:
      "@eslint-community/eslint-utils" "^4.2.0"
      "@eslint-community/regexpp" "^4.4.0"
      "@eslint/eslintrc" "^2.0.2"
-     "@eslint/js" "8.38.0"
+     "@eslint/js" "8.39.0"
      "@humanwhocodes/config-array" "^0.11.8"
      "@humanwhocodes/module-importer" "^1.0.1"
      "@nodelib/fs.walk" "^1.2.8"
@@@ -236,7 -236,7 +236,7 @@@
      debug "^4.3.2"
      doctrine "^3.0.0"
      escape-string-regexp "^4.0.0"
-     eslint-scope "^7.1.1"
+     eslint-scope "^7.2.0"
      eslint-visitor-keys "^3.4.0"
      espree "^9.5.1"
      esquery "^1.4.2"
@@@ -473,9 -473,9 +473,9 @@@ jquery-simulate@^1.0.2
    integrity sha512-Bq610fSrwTwvH5d06z5oskYaX/79s0BNrKiJZjZOiXRib3iL4ZkSn/wvLwzhf3P9KeXCEpk9wlIaGui/1arOpQ==
  
  js-cookie@^3.0.0:
 -  version "3.0.1"
 -  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
 -  integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 +  version "3.0.4"
 +  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.4.tgz#9ae3c5f6eb34d2292d76e0579fabfe7c872e1fae"
 +  integrity sha512-tlu5VGqPFMP5eBefnmszCFZkPXG2n527NRN9XdNtN6FZ5n/0e98TdDm8BOz290OIIsxtXb9XTJjfqE6gVhOHQw==
  
  js-sdsl@^4.1.4:
    version "4.2.0"
@@@ -571,9 -571,9 +571,9 @@@ optionator@^0.9.1
      word-wrap "^1.2.3"
  
  osm-community-index@^5.2.0:
 -  version "5.5.0"
 -  resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.5.0.tgz#a90568750b09509a050737e6aac83fd0c5bdc07d"
 -  integrity sha512-Od/DWFQsImvgJpXFyn75U5ak5kxoYuFxZ3X8fi699aqa/pmxpRFQfI9hWW/mZuk6jZ/0Gi3E1YG2TRxe4tmuTA==
 +  version "5.5.1"
 +  resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.5.1.tgz#f022ff6b283d05b91bfad77d9f74a38e628fe756"
 +  integrity sha512-QGCcq6xWMxUX6uyXK/xCBdmoXYMhfkDE15Dp09Udg7k5wadafAccz1BhRWyqZy/yciv8OE6s1QQsFB6y5TtV1g==
    dependencies:
      diacritics "^1.3.0"