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

diff --combined yarn.lock
index ba2514405b818dd8a88c5831d8d3fef283c855e4,7b4b7162af46e92fb6f9b2b8d68730c5841fd2bb..37f66e368b3cfc2788596a2b36392493a4fd5c62
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -214,9 -214,9 +214,9 @@@ eslint-visitor-keys@^3.3.0
    integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
  
  eslint@^8.0.0:
-   version "8.28.0"
-   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e"
-   integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==
+   version "8.29.0"
+   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87"
+   integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==
    dependencies:
      "@eslint/eslintrc" "^1.3.3"
      "@humanwhocodes/config-array" "^0.11.6"
@@@ -493,10 -493,10 +493,10 @@@ json-stable-stringify-without-jsonify@^
    resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
    integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
  
 -leaflet.locatecontrol@^0.78.0:
 -  version "0.78.0"
 -  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.78.0.tgz#fa87ac57fa79d2797f8f3e673d9eb3f104688310"
 -  integrity sha512-3cElL7dBPOMkzHTOWUA/SLogrWrmfqYkbIXAikbRD0QcEef4jJRYYVhkcUUTprS2cOQzg2UiR475v8jemJiXRg==
 +leaflet.locatecontrol@^0.79.0:
 +  version "0.79.0"
 +  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.79.0.tgz#0236b87c699a49f9ddb2f289941fbc0d3c3f8b62"
 +  integrity sha512-h64QIHFkypYdr90lkSfjKvPvvk8/b8UnP3m9WuoWdp5p2AaCWC0T1NVwyuj4rd5U4fBW3tQt4ppmZ2LceHMIDg==
  
  leaflet@^1.8.0:
    version "1.9.3"