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

diff --combined yarn.lock
index 0e3c564e8eead515b5c83c700e08e8e6410659ed,c3a579a7df564abbefe5248cc753692db8bc544b..c13ba694214e3c02467376e9c79fa08c1148f400
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -2,14 -2,14 +2,14 @@@
  # yarn lockfile v1
  
  
 -"@eslint/eslintrc@^1.0.4":
 -  version "1.0.4"
 -  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.4.tgz#dfe0ff7ba270848d10c5add0715e04964c034b31"
 -  integrity sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==
 +"@eslint/eslintrc@^1.0.5":
 +  version "1.0.5"
 +  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
 +  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
    dependencies:
      ajv "^6.12.4"
      debug "^4.3.2"
 -    espree "^9.0.0"
 +    espree "^9.2.0"
      globals "^13.9.0"
      ignore "^4.0.6"
      import-fresh "^3.2.1"
@@@ -17,19 -17,19 +17,19 @@@
      minimatch "^3.0.4"
      strip-json-comments "^3.1.1"
  
 -"@humanwhocodes/config-array@^0.6.0":
 -  version "0.6.0"
 -  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.6.0.tgz#b5621fdb3b32309d2d16575456cbc277fa8f021a"
 -  integrity sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==
 +"@humanwhocodes/config-array@^0.9.2":
 +  version "0.9.2"
 +  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
 +  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
    dependencies:
 -    "@humanwhocodes/object-schema" "^1.2.0"
 +    "@humanwhocodes/object-schema" "^1.2.1"
      debug "^4.1.1"
      minimatch "^3.0.4"
  
 -"@humanwhocodes/object-schema@^1.2.0":
 -  version "1.2.0"
 -  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
 -  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
 +"@humanwhocodes/object-schema@^1.2.1":
 +  version "1.2.1"
 +  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
 +  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
  
  "@types/color-name@^1.1.1":
    version "1.1.1"
@@@ -201,12 -201,12 +201,12 @@@ eslint-visitor-keys@^3.1.0
    integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
  
  eslint@^8.0.0:
 -  version "8.3.0"
 -  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.3.0.tgz#a3c2409507403c1c7f6c42926111d6cbefbc3e85"
 -  integrity sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==
 +  version "8.4.0"
 +  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.4.0.tgz#2fa01b271cafc28addc2719e551acff5e89f5230"
 +  integrity sha512-kv0XQcAQJL/VD9THQKhTQZVqkJKA+tIj/v2ZKNaIHRAADcJWFb+B/BAewUYuF6UVg1s2xC5qXVoDk0G8sKGeTA==
    dependencies:
 -    "@eslint/eslintrc" "^1.0.4"
 -    "@humanwhocodes/config-array" "^0.6.0"
 +    "@eslint/eslintrc" "^1.0.5"
 +    "@humanwhocodes/config-array" "^0.9.2"
      ajv "^6.10.0"
      chalk "^4.0.0"
      cross-spawn "^7.0.2"
@@@ -217,7 -217,7 +217,7 @@@
      eslint-scope "^7.1.0"
      eslint-utils "^3.0.0"
      eslint-visitor-keys "^3.1.0"
 -    espree "^9.1.0"
 +    espree "^9.2.0"
      esquery "^1.4.0"
      esutils "^2.0.2"
      fast-deep-equal "^3.1.3"
@@@ -244,10 -244,10 +244,10 @@@
      text-table "^0.2.0"
      v8-compile-cache "^2.0.3"
  
 -espree@^9.0.0, espree@^9.1.0:
 -  version "9.1.0"
 -  resolved "https://registry.yarnpkg.com/espree/-/espree-9.1.0.tgz#ba9d3c9b34eeae205724124e31de4543d59fbf74"
 -  integrity sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==
 +espree@^9.2.0:
 +  version "9.2.0"
 +  resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
 +  integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
    dependencies:
      acorn "^8.6.0"
      acorn-jsx "^5.3.1"
@@@ -556,9 -556,9 +556,9 @@@ punycode@^2.1.0
    integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
  
  qs@^6.9.4:
-   version "6.10.1"
-   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
-   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+   version "6.10.2"
+   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
+   integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
    dependencies:
      side-channel "^1.0.4"