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

diff --combined yarn.lock
index 9e26ca931f96a3754addfd9be561a58451c90556,73606bc732330f5311e6b73d03e8489b2c44afbb..f92004bcba13130564957cddc9f0ad1ae70d4750
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -23,10 -23,10 +23,10 @@@
      chalk "^2.0.0"
      js-tokens "^4.0.0"
  
 -"@eslint/eslintrc@^0.4.2":
 -  version "0.4.2"
 -  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"
 -  integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==
 +"@eslint/eslintrc@^0.4.3":
 +  version "0.4.3"
 +  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
 +  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
    dependencies:
      ajv "^6.12.4"
      debug "^4.1.1"
@@@ -38,20 -38,6 +38,20 @@@
      minimatch "^3.0.4"
      strip-json-comments "^3.1.1"
  
 +"@humanwhocodes/config-array@^0.5.0":
 +  version "0.5.0"
 +  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
 +  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
 +  dependencies:
 +    "@humanwhocodes/object-schema" "^1.2.0"
 +    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==
 +
  "@types/color-name@^1.1.1":
    version "1.1.1"
    resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@@ -284,13 -270,12 +284,13 @@@ eslint-visitor-keys@^2.0.0
    integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
  
  eslint@^7.3.1:
 -  version "7.29.0"
 -  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"
 -  integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==
 +  version "7.31.0"
 +  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca"
 +  integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==
    dependencies:
      "@babel/code-frame" "7.12.11"
 -    "@eslint/eslintrc" "^0.4.2"
 +    "@eslint/eslintrc" "^0.4.3"
 +    "@humanwhocodes/config-array" "^0.5.0"
      ajv "^6.10.0"
      chalk "^4.0.0"
      cross-spawn "^7.0.2"
@@@ -565,11 -550,6 +565,6 @@@ js-yaml@^3.13.1
      argparse "^1.0.7"
      esprima "^4.0.0"
  
- jshashes@~1.0.8:
-   version "1.0.8"
-   resolved "https://registry.yarnpkg.com/jshashes/-/jshashes-1.0.8.tgz#f60d837428383abf73ab022e1542e6614bd75514"
-   integrity sha512-btmQZ/w1rj8Lb6nEwvhjM7nBYoj54yaEFo2PWh3RkxZ8qNwuvOxvQYN/JxVuwoMmdIluL+XwYVJ+pEEZoSYybQ==
- 
  json-schema-traverse@^0.4.1:
    version "0.4.1"
    resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@@ -640,13 -620,6 +635,6 @@@ object-inspect@^1.9.0
    resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
    integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
  
- ohauth@^1.0.0:
-   version "1.0.1"
-   resolved "https://registry.yarnpkg.com/ohauth/-/ohauth-1.0.1.tgz#a5d4ab8e5390bb1cad68a58cc9c58630173c02f2"
-   integrity sha512-R9ZUN3+FVCwzeOOHCJpzA9jw/byRxp5O9X06mTL6Sp/LIQn/rLrMv6cwYctX+hoIKzRUsalGJXZ1kG5wBmSskQ==
-   dependencies:
-     jshashes "~1.0.8"
- 
  once@^1.3.0:
    version "1.4.0"
    resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"